Merge #760 #761

760: Revert "Disable feature check on MSRV" r=taiki-e a=taiki-e This reverts commit bce74ca. cargo-hack fixed the problem in [0.5.9](https://github.com/taiki-e/cargo-hack/releases/tag/v0.5.9). 761: Make installation of cargo-hack faster and robust r=taiki-e a=taiki-e Use [taiki-e/install-action](https://github.com/taiki-e/install-action) to install prebuilt binaries. This makes the installation faster and may avoid the impact of [problems caused by upstream changes](tokio-rs/bytes#506). Co-authored-by: Taiki Endo <[email protected]>
crossbeam-rs · Dec 31, 2021 · 59a313f · 59a313f
3 parents c254037 + f707f23 + b64d374
commit 59a313f
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 9 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -67,15 +67,14 @@ jobs:
       fail-fast: false
       matrix:
         rust:
-          # Some dependencies of benchmarks use the 2021 edition.
-          # TODO: Uncomment once https://github.com/taiki-e/cargo-hack/issues/135 implemented.
-          # - 1.36.0
+          - 1.36.0
           - nightly
     runs-on: ubuntu-latest
     steps:
       - 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
 
@@ -87,6 +86,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
 

diff --git a/ci/check-features.sh b/ci/check-features.sh
@@ -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

diff --git a/ci/dependencies.sh b/ci/dependencies.sh
@@ -3,8 +3,6 @@
 cd "$(dirname "$0")"/..
 set -ex
 
-cargo install cargo-hack
-
 cargo tree
 cargo tree --duplicate
 cargo tree --duplicate || exit 1