Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix new misdetected platform incompatibility in test-32bit #1874

Merged
merged 3 commits into from
Mar 11, 2025
Merged

Fix new misdetected platform incompatibility in test-32bit #1874

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8ec6df9
Revert "temporarily disable 32bit test job as it fails due to Rust to…
EliahKagan Mar 11, 2025
57de254
Use rustup script instead of action in test-32bit
EliahKagan Mar 4, 2025
8afe577
Specify default host triple rather than default toolchain
EliahKagan Mar 4, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 13 additions & 8 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,9 @@ jobs:
fi
done
- name: Install Rust via Rustup
run: curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --profile minimal
run: |
curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs |
sh -s -- -y --profile minimal
- name: Add Rust tools to path
run: echo "PATH=$HOME/.cargo/bin:$PATH" >> "$GITHUB_ENV"
- name: Generate dependency tree
Expand Down Expand Up @@ -206,11 +208,11 @@ jobs:
- container-arch: i386
runner-arch: amd64
runner-os: ubuntu-latest
toolchain: stable-i686-unknown-linux-gnu
host-triple: i686-unknown-linux-gnu
- container-arch: arm32v7
runner-arch: arm64
runner-os: ubuntu-24.04-arm
toolchain: stable-armv7-unknown-linux-gnueabihf
host-triple: armv7-unknown-linux-gnueabihf

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

Expand All @@ -235,10 +237,13 @@ jobs:
apt-get install --no-install-recommends -y -- "${prerequisites[@]}"
shell: bash
- uses: actions/checkout@v4
- uses: dtolnay/rust-toolchain@stable
with:
# Avoid possible misdetection based on the 64-bit running kernel.
toolchain: ${{ matrix.toolchain }}
- name: Install Rust via Rustup
run: |
# Specify toolchain to avoid possible misdetection based on the 64-bit running kernel.
curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs |
sh -s -- -y --default-host ${{ matrix.host-triple }} --profile minimal
- name: Add Rust tools to path
run: echo "PATH=$HOME/.cargo/bin:$PATH" >> "$GITHUB_ENV"
- uses: Swatinem/rust-cache@v2
- uses: taiki-e/install-action@v2
with:
Expand Down Expand Up @@ -390,7 +395,6 @@ jobs:
cargo-deny-advisories
wasm
tests-pass
test-32bit

defaults:
run:
Expand Down Expand Up @@ -425,6 +429,7 @@ jobs:
- test-journey
- test-fast
- test-fixtures-windows
- test-32bit
- lint
- cargo-deny
- check-packetline
Expand Down
Loading