Skip to content

Commit

Permalink
Make installation of cargo-hack faster and robust
Browse files Browse the repository at this point in the history
  • Loading branch information
taiki-e committed Dec 31, 2021
1 parent c254037 commit b64d374
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 6 deletions.
2 changes: 2 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,7 @@ 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: Check features
run: ./ci/check-features.sh

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

Expand Down
4 changes: 0 additions & 4 deletions ci/check-features.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,6 @@
cd "$(dirname "$0")"/..
set -ex

if [[ ! -x "$(command -v cargo-hack)" ]]; then
cargo +stable install --debug cargo-hack || exit 1
fi

if [[ "$RUST_VERSION" != "nightly"* ]]; then
# On MSRV, features other than nightly should work.
# * `--feature-powerset` - run for the feature powerset which includes --no-default-features and default features of package
Expand Down
2 changes: 0 additions & 2 deletions ci/dependencies.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@
cd "$(dirname "$0")"/..
set -ex

cargo install cargo-hack

cargo tree
cargo tree --duplicate
cargo tree --duplicate || exit 1
Expand Down

0 comments on commit b64d374

Please sign in to comment.