chore: fix installing `cargo-make` on CI

pull/689/head
rhysd 1 year ago
parent 96f7efee88
commit 26f280db93

@ -19,14 +19,11 @@ jobs:
matrix:
rust: ["1.58.1", "stable"]
steps:
# Always install stable for installing cargo-make
- uses: hecrj/setup-rust-action@967aec96c6a27a0ce15c1dac3aaba332d60565e2
with:
rust-version: ${{ matrix.rust }}
components: rustfmt,clippy
- uses: actions/checkout@v1
- name: "Get cargo bin directory"
id: cargo-bin-dir
run: echo "::set-output name=dir::$HOME/.cargo/bin"
rust-version: stable
if: ${{ matrix.rust != 'stable' }}
- name: "Cache cargo make"
id: cache-cargo-make
uses: actions/cache@v2
@ -35,7 +32,15 @@ jobs:
key: ${{ runner.os }}-${{ matrix.rust }}-cargo-make-${{ env.CI_CARGO_MAKE_VERSION }}
- name: "Install cargo-make"
if: steps.cache-cargo-make.outputs.cache-hit != 'true'
run: cargo install cargo-make --version ${{ env.CI_CARGO_MAKE_VERSION }}
run: cargo +stable install cargo-make --version ${{ env.CI_CARGO_MAKE_VERSION }}
- uses: hecrj/setup-rust-action@967aec96c6a27a0ce15c1dac3aaba332d60565e2
with:
rust-version: ${{ matrix.rust }}
components: rustfmt,clippy
- uses: actions/checkout@v1
- name: "Get cargo bin directory"
id: cargo-bin-dir
run: echo "::set-output name=dir::$HOME/.cargo/bin"
- name: "Format / Build / Test"
run: cargo make ci
env:
@ -48,14 +53,11 @@ jobs:
rust: ["1.58.1", "stable"]
steps:
- uses: actions/checkout@v1
# Always install stable for installing cargo-make
- uses: hecrj/setup-rust-action@967aec96c6a27a0ce15c1dac3aaba332d60565e2
with:
rust-version: ${{ matrix.rust }}
components: rustfmt,clippy
- uses: actions/checkout@v1
- name: "Get cargo bin directory"
id: cargo-bin-dir
run: echo "::set-output name=dir::$HOME\.cargo\bin"
rust-version: stable
if: ${{ matrix.rust != 'stable' }}
- name: "Cache cargo make"
id: cache-cargo-make
uses: actions/cache@v2
@ -64,7 +66,15 @@ jobs:
key: ${{ runner.os }}-${{ matrix.rust }}-cargo-make-${{ env.CI_CARGO_MAKE_VERSION }}
- name: "Install cargo-make"
if: steps.cache-cargo-make.outputs.cache-hit != 'true'
run: cargo install cargo-make --version ${{ env.CI_CARGO_MAKE_VERSION }}
run: cargo +stable install cargo-make --version ${{ env.CI_CARGO_MAKE_VERSION }}
- uses: hecrj/setup-rust-action@967aec96c6a27a0ce15c1dac3aaba332d60565e2
with:
rust-version: ${{ matrix.rust }}
components: rustfmt,clippy
- uses: actions/checkout@v1
- name: "Get cargo bin directory"
id: cargo-bin-dir
run: echo "::set-output name=dir::$HOME\.cargo\bin"
- name: "Format / Build / Test"
run: cargo make ci
env:

Loading…
Cancel
Save