Skip to content

Commit

Permalink
Use install-action to install cross
Browse files Browse the repository at this point in the history
  • Loading branch information
taiki-e committed Jan 23, 2022
1 parent 1b41f9c commit 8cd68fa
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 3 deletions.
9 changes: 7 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,9 @@ jobs:
- name: Install Rust
# --no-self-update is necessary because the windows environment cannot self-update rustup.exe.
run: rustup update ${{ matrix.rust }} --no-self-update && rustup default ${{ matrix.rust }}
- name: Install cross
uses: taiki-e/install-action@cross
if: matrix.target != ''
- name: Test
run: ./ci/test.sh

Expand All @@ -79,7 +82,8 @@ jobs:
- uses: actions/checkout@v2
- name: Install Rust
run: rustup update ${{ matrix.rust }} && rustup default ${{ matrix.rust }}
- uses: taiki-e/install-action@cargo-hack
- name: Install cargo-hack
uses: taiki-e/install-action@cargo-hack
- name: Check features
run: ./ci/check-features.sh

Expand All @@ -90,7 +94,8 @@ jobs:
- uses: actions/checkout@v2
- name: Install Rust
run: rustup update nightly && rustup default nightly
- uses: taiki-e/install-action@cargo-hack
- name: Install cargo-hack
uses: taiki-e/install-action@cargo-hack
- name: dependency tree check
run: ./ci/dependencies.sh

Expand Down
1 change: 0 additions & 1 deletion ci/test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ export RUSTFLAGS="-D warnings"

if [[ -n "$RUST_TARGET" ]]; then
# If RUST_TARGET is specified, use cross for testing.
cargo install cross
cross test --all --target "$RUST_TARGET" --exclude benchmarks -- --test-threads=1

# For now, the non-host target only runs tests.
Expand Down

0 comments on commit 8cd68fa

Please sign in to comment.