Skip to content

Commit 71824b0

Browse files
authored
ci: test AArch64 and run tests instead of build in cross job (#763)
1 parent 7a87660 commit 71824b0

File tree

2 files changed

+19
-19
lines changed

2 files changed

+19
-19
lines changed

.github/workflows/ci.yml

+18-19
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,7 @@ jobs:
6363
matrix:
6464
os:
6565
- ubuntu-latest
66+
- ubuntu-22.04-arm # TODO: update to 24.04 when https://github.com/rust-lang/rust/issues/135867 solved
6667
- macos-latest
6768
- windows-latest
6869
runs-on: ${{ matrix.os }}
@@ -104,29 +105,27 @@ jobs:
104105
name: cross
105106
strategy:
106107
matrix:
107-
target:
108-
- i686-unknown-linux-gnu
109-
- armv7-unknown-linux-gnueabihf
110-
- powerpc-unknown-linux-gnu
111-
- powerpc64-unknown-linux-gnu
112-
- wasm32-unknown-unknown
113-
runs-on: ubuntu-latest
108+
include:
109+
- target: i686-unknown-linux-gnu
110+
os: ubuntu-latest
111+
- target: armv7-unknown-linux-gnueabihf
112+
os: ubuntu-22.04-arm # TODO: update to 24.04 when https://github.com/rust-lang/rust/issues/135867 solved
113+
- target: powerpc-unknown-linux-gnu
114+
os: ubuntu-latest
115+
- target: powerpc64-unknown-linux-gnu
116+
os: ubuntu-latest
117+
- target: wasm32-wasip1
118+
os: ubuntu-latest
119+
runs-on: ${{ matrix.os }}
114120
steps:
115121
- uses: actions/checkout@v4
116122
- name: Install Rust
117123
run: rustup update stable
118-
- name: Install cross
119-
uses: taiki-e/install-action@cross
120-
if: matrix.target != 'wasm32-unknown-unknown'
121-
- name: cross build --target ${{ matrix.target }}
122-
run: cross build --target ${{ matrix.target }}
123-
if: matrix.target != 'wasm32-unknown-unknown'
124-
# WASM support
125-
- name: cargo build --target ${{ matrix.target }}
126-
run: |
127-
rustup target add ${{ matrix.target }}
128-
cargo build --target ${{ matrix.target }}
129-
if: matrix.target == 'wasm32-unknown-unknown'
124+
- uses: taiki-e/setup-cross-toolchain-action@v1
125+
with:
126+
target: ${{ matrix.target }}
127+
- name: Test
128+
run: cargo test --target ${{ matrix.target }}
130129

131130
# Sanitizers
132131
tsan:

tests/test_bytes.rs

+1
Original file line numberDiff line numberDiff line change
@@ -728,6 +728,7 @@ fn advance_past_len() {
728728
// Only run these tests on little endian systems. CI uses qemu for testing
729729
// big endian... and qemu doesn't really support threading all that well.
730730
#[cfg(any(miri, target_endian = "little"))]
731+
#[cfg(not(target_family = "wasm"))] // wasm without experimental threads proposal doesn't support threads
731732
fn stress() {
732733
// Tests promoting a buffer from a vec -> shared in a concurrent situation
733734
use std::sync::{Arc, Barrier};

0 commit comments

Comments
 (0)