Fix setting hostname in container in CI

frozencemetery · frozencemetery · commit 93ce057b1c00 · 2020-11-13T15:18:31.000-05:00
Our venerable hack of setting the hostname on the host doesn't seem to
work on newer Fedora.

Signed-off-by: Robbie Harwood &lt;rharwood@redhat.com&gt;
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

Original file line number	Diff line number	Diff line change
`@@ -4,15 +4,15 @@`
`4`	`4`	`"jobs": {`
`5`	`5`	`"update-pages": {`
`6`	`6`	`"runs-on": "ubuntu-latest",`
	`7`	`+ "container": "fedora-latest",`
`7`	`8`	`"steps": [`
`8`	`9`	`{`
`9`	`10`	`"name": "Check out code",`
`10`	`11`	`"uses": "actions/checkout@v2",`
`11`	`12`	`},`
`12`	`13`	`{`
`13`	`14`	`"name": "Build docs",`
`14`		`- "run": "./ci/run-on-linux.sh ./ci/before-docs-deploy.sh",`
`15`		`- "env": { "DISTRO": "fedora:latest" },`
	`15`	`+ "run": "./ci/before-docs-deploy.sh",`
`16`	`16`	`},`
`17`	`17`	`{`
`18`	`18`	`"name": "Deploy latest docs",`