Skip to content

Commit

Permalink
Combine the WASM CI job with the others
Browse files Browse the repository at this point in the history
There isn't any reason to be distinct here, and it would be better to
test with all feature configurations in run.sh anyway.
  • Loading branch information
tgross35 committed Oct 29, 2024
1 parent 14c7066 commit 4b89115
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 17 deletions.
23 changes: 7 additions & 16 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ env:

jobs:
test:
name: Docker
name: Build and test
timeout-minutes: 20
strategy:
fail-fast: false
Expand Down Expand Up @@ -52,6 +52,9 @@ jobs:
os: ubuntu-latest
- target: x86_64-apple-darwin
os: macos-13
- target: wasm32-unknown-unknown
os: ubuntu-latest
build_only: 1
- target: i686-pc-windows-msvc
os: windows-latest
- target: x86_64-pc-windows-msvc
Expand Down Expand Up @@ -89,30 +92,19 @@ jobs:

# Non-linux tests just use our raw script
- name: Run locally
if: matrix.os != 'ubuntu-latest'
if: matrix.os != 'ubuntu-latest' || contains(matrix.target, 'wasm')
shell: bash
run: ./ci/run.sh ${{ matrix.target }}

# Otherwise we use our docker containers to run builds
- name: Run in Docker
if: matrix.os == 'ubuntu-latest'
if: matrix.os == 'ubuntu-latest' && !contains(matrix.target, 'wasm')
run: |
rustup target add x86_64-unknown-linux-musl
cargo generate-lockfile && ./ci/run-docker.sh ${{ matrix.target }}
wasm:
name: WebAssembly
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@master
- name: Install Rust
run: rustup update nightly --no-self-update && rustup default nightly
- run: rustup target add wasm32-unknown-unknown
- uses: Swatinem/rust-cache@v2
- run: cargo build --target wasm32-unknown-unknown

builtins:
name: "The compiler-builtins crate works"
name: Check use with compiler-builtins
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@master
Expand Down Expand Up @@ -164,7 +156,6 @@ jobs:
success:
needs:
- test
- wasm
- builtins
- benchmarks
- msrv
Expand Down
2 changes: 1 addition & 1 deletion ci/run.sh
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ if [ "${BUILD_ONLY:-}" = "1" ]; then
$cmd
$cmd --features "unstable-intrinsics"

echo "can't run tests on $target"
echo "can't run tests on $target; skipping"
else
cmd="cargo test --all --target $target $extra_flags"

Expand Down

0 comments on commit 4b89115

Please sign in to comment.