Skip to content

Commit baa3b15

Browse files
Don't use Github Actions's container integration
The odd way integrations don't interact meant that the deploy pipeline couldn't find git, but we were left with no way to install git for it. Partially reverts 93ce057 . Signed-off-by: Robbie Harwood <[email protected]>
1 parent 1f5ef63 commit baa3b15

File tree

4 files changed

+15
-15
lines changed

4 files changed

+15
-15
lines changed

.github/workflows/build.yml

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,6 @@
1111
"jobs": {
1212
"linux": {
1313
"runs-on": "ubuntu-latest",
14-
"container": {
15-
"image": "${{ matrix.distro }}",
16-
"options": "-htest.box",
17-
},
1814
"strategy": {
1915
"fail-fast": false,
2016
"matrix": {
@@ -49,8 +45,9 @@
4945
},
5046
{
5147
"name": "Build and test gssapi",
52-
"run": "./ci/build.sh",
48+
"run": "./ci/run-on-linux.sh ./ci/build.sh",
5349
"env": {
50+
"DISTRO": "${{ matrix.distro }}",
5451
"KRB5_VER": "${{ matrix.krb5_ver }}",
5552
"FLAKE": "${{ matrix.flake }}",
5653
},

.github/workflows/deploy-docs.yml

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,18 +4,14 @@
44
"jobs": {
55
"update-pages": {
66
"runs-on": "ubuntu-latest",
7-
"container": {
8-
"image": "fedora:latest",
9-
"options": "-htest.box",
10-
},
117
"steps": [
128
{
139
"name": "Check out code",
1410
"uses": "actions/checkout@v2",
1511
},
1612
{
1713
"name": "Build docs",
18-
"run": "./ci/before-docs-deploy.sh",
14+
"run": "./ci/run-on-linux.sh ./ci/before-docs-deploy.sh",
1915
},
2016
{
2117
"name": "Deploy latest docs",

.github/workflows/release.yml

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,18 +4,15 @@
44
"jobs": {
55
"release-linux": {
66
"runs-on": "ubuntu-latest",
7-
"container": {
8-
"image": "fedora:latest",
9-
"options": "-htest.box",
10-
},
117
"steps": [
128
{
139
"name": "Check out code",
1410
"uses": "actions/checkout@v2",
1511
},
1612
{
1713
"name": "Set things up",
18-
"run": "./ci/before-deploy.sh",
14+
"env": { "DISTRO": "fedora:latest" },
15+
"run": "./ci/run-on-linux.sh ./ci/before-deploy.sh",
1916
},
2017
{
2118
"name": "Deploy to PyPI",

ci/run-on-linux.sh

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
#!/bin/bash -ex
2+
3+
# If we try to use a normal Github Actions container with
4+
# github-pages-deploy-action, it will fail due to inability to find git.
5+
6+
docker run -h test.box \
7+
-v `pwd`:/tmp/build -w /tmp/build \
8+
-e KRB5_VER=${KRB5_VER:-mit} \
9+
-e FLAKE=${FLAKE:no} \
10+
$DISTRO /bin/bash -ex $@

0 commit comments

Comments
 (0)