Skip to content

Commit 5443bf2

Browse files
authored
Merge pull request #1874 from EliahKagan/run-ci/non-host
Fix new misdetected platform incompatibility in `test-32bit`
2 parents 02bc8cb + 8afe577 commit 5443bf2

File tree

1 file changed

+13
-8
lines changed

1 file changed

+13
-8
lines changed

.github/workflows/ci.yml

+13-8
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,9 @@ jobs:
5353
fi
5454
done
5555
- name: Install Rust via Rustup
56-
run: curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --profile minimal
56+
run: |
57+
curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs |
58+
sh -s -- -y --profile minimal
5759
- name: Add Rust tools to path
5860
run: echo "PATH=$HOME/.cargo/bin:$PATH" >> "$GITHUB_ENV"
5961
- name: Generate dependency tree
@@ -236,11 +238,11 @@ jobs:
236238
- container-arch: i386
237239
runner-arch: amd64
238240
runner-os: ubuntu-latest
239-
toolchain: stable-i686-unknown-linux-gnu
241+
host-triple: i686-unknown-linux-gnu
240242
- container-arch: arm32v7
241243
runner-arch: arm64
242244
runner-os: ubuntu-24.04-arm
243-
toolchain: stable-armv7-unknown-linux-gnueabihf
245+
host-triple: armv7-unknown-linux-gnueabihf
244246

245247
runs-on: ${{ matrix.runner-os }}
246248

@@ -265,10 +267,13 @@ jobs:
265267
apt-get install --no-install-recommends -y -- "${prerequisites[@]}"
266268
shell: bash
267269
- uses: actions/checkout@v4
268-
- uses: dtolnay/rust-toolchain@stable
269-
with:
270-
# Avoid possible misdetection based on the 64-bit running kernel.
271-
toolchain: ${{ matrix.toolchain }}
270+
- name: Install Rust via Rustup
271+
run: |
272+
# Specify toolchain to avoid possible misdetection based on the 64-bit running kernel.
273+
curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs |
274+
sh -s -- -y --default-host ${{ matrix.host-triple }} --profile minimal
275+
- name: Add Rust tools to path
276+
run: echo "PATH=$HOME/.cargo/bin:$PATH" >> "$GITHUB_ENV"
272277
- uses: Swatinem/rust-cache@v2
273278
- uses: taiki-e/install-action@v2
274279
with:
@@ -420,7 +425,6 @@ jobs:
420425
cargo-deny-advisories
421426
wasm
422427
tests-pass
423-
test-32bit
424428
425429
defaults:
426430
run:
@@ -455,6 +459,7 @@ jobs:
455459
- test-journey
456460
- test-fast
457461
- test-fixtures-windows
462+
- test-32bit
458463
- lint
459464
- cargo-deny
460465
- check-packetline

0 commit comments

Comments
 (0)