Skip to content

Commit 8299ff3

Browse files
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 <[email protected]>
1 parent 12ddba0 commit 8299ff3

File tree

4 files changed

+12
-20
lines changed

4 files changed

+12
-20
lines changed

.github/workflows/build.yml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,10 @@
1111
"jobs": {
1212
"linux": {
1313
"runs-on": "ubuntu-latest",
14+
"container": {
15+
"image": "${{ matrix.distro }}",
16+
"options": "-htest.box",
17+
},
1418
"strategy": {
1519
"fail-fast": false,
1620
"matrix": {
@@ -45,9 +49,8 @@
4549
},
4650
{
4751
"name": "Build and test gssapi",
48-
"run": "./ci/run-on-linux.sh ./ci/build.sh",
52+
"run": "./ci/build.sh",
4953
"env": {
50-
"DISTRO": "${{ matrix.distro }}",
5154
"KRB5_VER": "${{ matrix.krb5_ver }}",
5255
"FLAKE": "${{ matrix.flake }}",
5356
},

.github/workflows/deploy-docs.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,15 @@
44
"jobs": {
55
"update-pages": {
66
"runs-on": "ubuntu-latest",
7+
"container": "fedora-latest",
78
"steps": [
89
{
910
"name": "Check out code",
1011
"uses": "actions/checkout@v2",
1112
},
1213
{
1314
"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",
1616
},
1717
{
1818
"name": "Deploy latest docs",

.github/workflows/release.yml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,18 @@
44
"jobs": {
55
"release-linux": {
66
"runs-on": "ubuntu-latest",
7+
"container": {
8+
"image": "fedora:latest",
9+
"options": "-htest.box",
10+
},
711
"steps": [
812
{
913
"name": "Check out code",
1014
"uses": "actions/checkout@v2",
1115
},
1216
{
1317
"name": "Set things up",
14-
"run": "./ci/run-on-linux.sh ./ci/before-deploy.sh",
15-
"env": { "DISTRO": "fedora:latest" },
18+
"run": "./ci/before-deploy.sh",
1619
},
1720
{
1821
"name": "Deploy to PyPI",

ci/run-on-linux.sh

Lines changed: 0 additions & 14 deletions
This file was deleted.

0 commit comments

Comments
 (0)