From 587b59ff1ab2e85bc33e300fd4e887ec536988a3 Mon Sep 17 00:00:00 2001 From: Shingo Kato Date: Fri, 18 Sep 2020 16:19:43 +0000 Subject: [PATCH] ci: use rust-toolchain version as stable version --- .github/workflows/ci.yml | 14 ++++++++++---- .github/workflows/release.yml | 1 - 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 3fe145390..20077d74d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -19,7 +19,6 @@ jobs: uses: actions-rs/toolchain@v1 with: profile: minimal - toolchain: stable override: true - name: Install LLVM @@ -48,7 +47,16 @@ jobs: with: submodules: true + - name: Install toolchain + if: ${{ matrix.config.toolchain == 'stable' }} + uses: actions-rs/toolchain@v1 + with: + profile: minimal + override: true + components: rustfmt + - name: Install ${{ matrix.config.toolchain }} toolchain + if: ${{ matrix.config.toolchain != 'stable' }} uses: actions-rs/toolchain@v1 with: profile: minimal @@ -73,7 +81,7 @@ jobs: crate: mdbook version: latest use-tool-cache: true - + - name: mdbook test if: ${{ matrix.config.os == 'ubuntu-latest' && matrix.config.toolchain == 'stable' }} run: mdbook test book -L target/debug/deps @@ -98,7 +106,6 @@ jobs: uses: actions-rs/toolchain@v1 with: profile: minimal - toolchain: stable override: true components: clippy, rustfmt @@ -128,7 +135,6 @@ jobs: - name: Install toolchain uses: actions-rs/toolchain@v1 with: - toolchain: stable override: true - name: Install LLVM diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index fa541694f..2387d265b 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -41,7 +41,6 @@ jobs: uses: actions-rs/toolchain@v1 with: profile: minimal - toolchain: stable override: true - name: Install LLVM