Skip to content

Commit 79c29da

Browse files
authored
Cleanup Auxiliary Linux tests (#466)
This PR explictly installs 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 a1ae804 commit 79c29da

File tree

1 file changed

+14
-8
lines changed

1 file changed

+14
-8
lines changed

.github/workflows/tests.yml

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -71,20 +71,26 @@ jobs:
7171
runs-on: ubuntu-22.04
7272
strategy:
7373
matrix:
74-
target: [
75-
x86_64-unknown-linux-musl,
76-
i686-unknown-linux-gnu,
77-
i686-unknown-linux-musl,
78-
]
74+
target: [x86_64-unknown-linux-musl, i686-unknown-linux-musl]
75+
include:
76+
- target: i686-unknown-linux-gnu
77+
packages: libc6-dev-i386 lib32gcc-11-dev
78+
- target: x86_64-unknown-linux-gnux32
79+
packages: libc6-dev-x32 libx32gcc-11-dev
80+
# TODO: Find a Linux image/runner with CONFIG_X86_X32_ABI set
81+
cargo_test_opts: --no-run
7982
steps:
8083
- uses: actions/checkout@v3
8184
- uses: dtolnay/rust-toolchain@stable
8285
with:
8386
targets: ${{ matrix.target }}
84-
- name: Install multilib
85-
run: sudo apt-get update && sudo apt-get install gcc-multilib
87+
- name: Install libc and libgcc
88+
if: matrix.packages
89+
run: |
90+
sudo apt-get update
91+
sudo apt-get install --no-install-recommends ${{ matrix.packages }}
8692
- uses: Swatinem/rust-cache@v2
87-
- run: cargo test --target=${{ matrix.target }} --features=std
93+
- run: cargo test ${{ matrix.cargo_test_opts }} --target=${{ matrix.target }} --features=std
8894

8995
ios-tests:
9096
name: iOS Simulator Test

0 commit comments

Comments
 (0)