Fix setting hostname in container in CI

Our venerable hack of setting the hostname on the host doesn't seem to work on newer Fedora. Signed-off-by: Robbie Harwood <rharwood@redhat.com>
pythongssapi · Nov 13, 2020 · 8299ff3 · 8299ff3
1 parent 12ddba0
commit 8299ff3
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 20 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -11,6 +11,10 @@
     "jobs": {
         "linux": {
             "runs-on": "ubuntu-latest",
+            "container": {
+                "image": "${{ matrix.distro }}",
+                "options": "-htest.box",
+            },
             "strategy": {
                 "fail-fast": false,
                 "matrix": {
@@ -45,9 +49,8 @@
                 },
                 {
                     "name": "Build and test gssapi",
-                    "run": "./ci/run-on-linux.sh ./ci/build.sh",
+                    "run": "./ci/build.sh",
                     "env": {
-                        "DISTRO": "${{ matrix.distro }}",
                         "KRB5_VER": "${{ matrix.krb5_ver }}",
                         "FLAKE": "${{ matrix.flake }}",
                     },

diff --git a/.github/workflows/deploy-docs.yml b/.github/workflows/deploy-docs.yml
@@ -4,15 +4,15 @@
     "jobs": {
         "update-pages": {
             "runs-on": "ubuntu-latest",
+            "container": "fedora-latest",
             "steps": [
                 {
                     "name": "Check out code",
                     "uses": "actions/checkout@v2",
                 },
                 {
                     "name": "Build docs",
-                    "run": "./ci/run-on-linux.sh ./ci/before-docs-deploy.sh",
-                    "env": { "DISTRO": "fedora:latest" },
+                    "run": "./ci/before-docs-deploy.sh",
                 },
                 {
                     "name": "Deploy latest docs",

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -4,15 +4,18 @@
     "jobs": {
         "release-linux": {
             "runs-on": "ubuntu-latest",
+            "container": {
+                "image": "fedora:latest",
+                "options": "-htest.box",
+            },
             "steps": [
                 {
                     "name": "Check out code",
                     "uses": "actions/checkout@v2",
                 },
                 {
                     "name": "Set things up",
-                    "run": "./ci/run-on-linux.sh ./ci/before-deploy.sh",
-                    "env": { "DISTRO": "fedora:latest" },
+                    "run": "./ci/before-deploy.sh",
                 },
                 {
                     "name": "Deploy to PyPI",

diff --git a/ci/run-on-linux.sh b/ci/run-on-linux.sh