Skip to content

Commit 0d54b5f

Browse files
committed
Change i686 job to i686-unknown-linux-gnu, run in container
The previous approach did not work because musl dependencies were not installed. (32-bit `-gnu` dependencies would also not be installed, in that non-container environment.) Since this is switching to a container, it may as well target the OS of the container. The previous reasoning for not (also?) having this 32-bit test use `GIX_TEST_IGNORE_ARCHIVES=1` no longer applies, but that is not done at this time.
1 parent 094023a commit 0d54b5f

File tree

1 file changed

+8
-6
lines changed

1 file changed

+8
-6
lines changed

.github/workflows/ci.yml

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -198,21 +198,23 @@ jobs:
198198
test-32bit:
199199
runs-on: ubuntu-latest
200200

201-
env:
202-
TARGET: i686-unknown-linux-musl
201+
container: i386/debian:stable-slim
203202

204203
steps:
204+
- name: Prerequisites
205+
run: |
206+
apt-get update
207+
apt-get install --no-install-recommends -y build-essential ca-certificates cmake curl git jq libssl-dev pkgconf
205208
- uses: actions/checkout@v4
206-
- uses: dtolnay/rust-toolchain@master
209+
- uses: dtolnay/rust-toolchain@stable
207210
with:
208-
toolchain: stable
209-
targets: ${{ env.TARGET }}
211+
toolchain: stable-i686-unknown-linux-gnu # Otherwise it may misdetect based on the amd64 kernel.
210212
- uses: Swatinem/rust-cache@v2
211213
- uses: taiki-e/install-action@v2
212214
with:
213215
tool: nextest
214216
- name: Test (nextest)
215-
run: cargo nextest run --target "$TARGET" --workspace --no-fail-fast
217+
run: cargo nextest run --workspace --no-fail-fast
216218

217219
test-32bit-cross:
218220
runs-on: ubuntu-latest

0 commit comments

Comments
 (0)