Skip to content

Commit 0b62138

Browse files
authored
fix alpine CI (#1028)
1 parent 7f0dc45 commit 0b62138

1 file changed

Lines changed: 30 additions & 4 deletions

File tree

.github/workflows/ci.yml

Lines changed: 30 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -132,18 +132,23 @@ jobs:
132132
NOXSESSION: ${{ matrix.PYTHON.NOXSESSION }}
133133
CARGO_TARGET_DIR: ${{ format('{0}/src/_bcrypt/target/', github.workspace) }}
134134

135-
linux-distros:
135+
alpine:
136136
runs-on: ${{ matrix.IMAGE.RUNNER }}
137-
container: ghcr.io/pyca/cryptography-runner-${{ matrix.IMAGE.IMAGE }}
137+
container:
138+
image: ghcr.io/pyca/cryptography-runner-${{ matrix.IMAGE.IMAGE }}
139+
volumes:
140+
- /staticnodehost:/staticnodecontainer:rw,rshared
141+
- /staticnodehost:/__e/node20:ro,rshared
138142
strategy:
139143
matrix:
140144
IMAGE:
141145
- {IMAGE: "alpine", NOXSESSION: "tests", RUNNER: "ubuntu-latest"}
142146
- {IMAGE: "alpine:aarch64", NOXSESSION: "tests", RUNNER: "ubuntu-24.04-arm"}
143-
- {IMAGE: "ubuntu-rolling:aarch64", NOXSESSION: "tests", RUNNER: "ubuntu-24.04-arm"}
144-
- {IMAGE: "ubuntu-rolling:armv7l", NOXSESSION: "tests", RUNNER: "ubuntu-24.04-arm"}
145147
name: "${{ matrix.IMAGE.NOXSESSION }} on ${{ matrix.IMAGE.IMAGE }}"
146148
steps:
149+
- name: Ridiculous-er workaround for static node20
150+
run: |
151+
cp -R /staticnode/* /staticnodecontainer/
147152
- name: Ridiculous alpine workaround for actions support on arm64
148153
run: |
149154
# This modifies /etc/os-release so the JS actions
@@ -162,13 +167,34 @@ jobs:
162167
RUSTUP_HOME: /root/.rustup
163168
CARGO_TARGET_DIR: ${{ format('{0}/src/_bcrypt/target/', github.workspace) }}
164169

170+
linux-distros:
171+
runs-on: ${{ matrix.IMAGE.RUNNER }}
172+
container: ghcr.io/pyca/cryptography-runner-${{ matrix.IMAGE.IMAGE }}
173+
strategy:
174+
matrix:
175+
IMAGE:
176+
- {IMAGE: "ubuntu-rolling:aarch64", NOXSESSION: "tests", RUNNER: "ubuntu-24.04-arm"}
177+
- {IMAGE: "ubuntu-rolling:armv7l", NOXSESSION: "tests", RUNNER: "ubuntu-24.04-arm"}
178+
name: "${{ matrix.IMAGE.NOXSESSION }} on ${{ matrix.IMAGE.IMAGE }}"
179+
steps:
180+
- uses: actions/checkout@v4.2.2
181+
with:
182+
persist-credentials: false
183+
- run: /venv/bin/pip install nox
184+
- run: /venv/bin/nox -v
185+
env:
186+
NOXSESSION: ${{ matrix.IMAGE.NOXSESSION }}
187+
RUSTUP_HOME: /root/.rustup
188+
CARGO_TARGET_DIR: ${{ format('{0}/src/_bcrypt/target/', github.workspace) }}
189+
165190
all-green: # This job does nothing and is only used for the branch protection
166191
if: always()
167192

168193
needs:
169194
- macos
170195
- windows
171196
- linux
197+
- alpine
172198
- linux-distros
173199

174200
runs-on: ubuntu-latest

0 commit comments

Comments
 (0)