Skip to content

Commit af3451d

Browse files
committed
[CI] [debian] Containerize testing of standalone
This should hopefully deal with #1394 (comment)
1 parent da18c98 commit af3451d

File tree

1 file changed

+33
-9
lines changed

1 file changed

+33
-9
lines changed

.github/workflows/coq-debian.yml

+33-9
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ jobs:
102102
- name: display per-line timing info
103103
run: etc/ci/github-actions-display-per-line-timing.sh
104104

105-
test-standalone:
105+
test-standalone-host:
106106
strategy:
107107
fail-fast: false
108108
matrix:
@@ -135,10 +135,30 @@ jobs:
135135
printf '::warning::Debian ${{ matrix.debian }} binary does not run on ubuntu: %s\n' \
136136
"$(etc/ci/test-run-fiat-crypto.sh dist/fiat_crypto 2>&1 | tr '\n' '~' | sed 's/~/%0A/g')";
137137
}
138-
- name: setup Debian chroot
139-
run: etc/ci/setup-debian-chroot.sh "${{ matrix.debian }}"
138+
139+
test-standalone-container:
140+
strategy:
141+
fail-fast: false
142+
matrix:
143+
include:
144+
- debian: sid
145+
#- debian: bookworm # restore once 8.17 lands in Debian stable
146+
runs-on: ubuntu-latest
147+
container: debian:${{ matrix.debian }}
148+
needs: build
149+
steps:
150+
- uses: actions/checkout@v4
151+
- name: Download standalone ${{ matrix.debian }}
152+
uses: actions/download-artifact@v4
153+
with:
154+
name: standalone-${{ matrix.debian }}
155+
path: dist/
156+
- name: List files
157+
run: find dist
158+
- run: chmod +x dist/fiat_crypto
159+
- name: host build params
160+
run: etc/ci/describe-system-config.sh
140161
- name: Test files (container)
141-
shell: in-debian-chroot.sh {0}
142162
run: |
143163
echo "::group::file fiat_crypto"
144164
file dist/fiat_crypto
@@ -187,18 +207,22 @@ jobs:
187207

188208
debian-check-all:
189209
runs-on: ubuntu-latest
190-
needs: [build, test-standalone, publish-standalone-dry-run]
210+
needs: [build, test-standalone-host, test-standalone-container, publish-standalone-dry-run]
191211
if: always()
192212
steps:
193213
- run: echo 'build passed'
194214
if: ${{ needs.build.result == 'success' }}
195-
- run: echo 'test-standalone passed'
196-
if: ${{ needs.test-standalone.result == 'success' }}
215+
- run: echo 'test-standalone-host passed'
216+
if: ${{ needs.test-standalone-host.result == 'success' }}
217+
- run: echo 'test-standalone-container passed'
218+
if: ${{ needs.test-standalone-container.result == 'success' }}
197219
- run: echo 'publish-standalone-dry-run passed'
198220
if: ${{ needs.publish-standalone-dry-run.result == 'success' }}
199221
- run: echo 'build failed' && false
200222
if: ${{ needs.build.result != 'success' }}
201-
- run: echo 'test-standalone failed' && false
202-
if: ${{ needs.test-standalone.result != 'success' }}
223+
- run: echo 'test-standalone-host failed' && false
224+
if: ${{ needs.test-standalone-host.result != 'success' }}
225+
- run: echo 'test-standalone-container failed' && false
226+
if: ${{ needs.test-standalone-container.result != 'success' }}
203227
- run: echo 'publish-standalone-dry-run failed' && false
204228
if: ${{ needs.publish-standalone-dry-run.result != 'success' }}

0 commit comments

Comments
 (0)