Skip to content

Commit fce0db4

Browse files
committed
Cleanup Auxilerary Linux tests
This PR merges the "extra" Linux tests into a single job. This reduces the number of jobs we have to run as part of the CI. We also explictly install libc and libgcc (to make it clear these are the only extra dev dependancies). I also added building/linking of the x32 target. As noted in #464, this will not run in the current github actions runner due to an incompatible kernel config. Signed-off-by: Joe Richey <[email protected]>
1 parent 10a0ae0 commit fce0db4

File tree

1 file changed

+10
-11
lines changed

1 file changed

+10
-11
lines changed

.github/workflows/tests.yml

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -69,22 +69,21 @@ jobs:
6969
linux-tests:
7070
name: Linux Test
7171
runs-on: ubuntu-22.04
72-
strategy:
73-
matrix:
74-
target: [
75-
x86_64-unknown-linux-musl,
76-
i686-unknown-linux-gnu,
77-
i686-unknown-linux-musl,
78-
]
7972
steps:
8073
- uses: actions/checkout@v3
8174
- uses: dtolnay/rust-toolchain@stable
8275
with:
83-
targets: ${{ matrix.target }}
84-
- name: Install multilib
85-
run: sudo apt-get update && sudo apt-get install gcc-multilib
76+
targets: x86_64-unknown-linux-musl, i686-unknown-linux-gnu, i686-unknown-linux-musl, x86_64-unknown-linux-gnux32
77+
- name: Install libc and libgcc for 32-bit targets
78+
run: |
79+
sudo apt-get update
80+
sudo apt-get install --no-install-recommends libc6-dev-i386 libc6-dev-x32 lib32gcc-11-dev libx32gcc-11-dev
8681
- uses: Swatinem/rust-cache@v2
87-
- run: cargo test --target=${{ matrix.target }} --features=std
82+
- run: cargo test --target=x86_64-unknown-linux-musl --features=std
83+
- run: cargo test --target=i686-unknown-linux-gnu --features=std
84+
- run: cargo test --target=i686-unknown-linux-musl --features=std
85+
# TODO: Find a Linux image/runner with CONFIG_X86_X32_ABI set
86+
- run: cargo test --no-run --target=x86_64-unknown-linux-gnux32 --features=std
8887

8988
ios-tests:
9089
name: iOS Simulator Test

0 commit comments

Comments
 (0)