From 64e53b128351def357bb13fe80608cfb795c4da1 Mon Sep 17 00:00:00 2001 From: lcdr Date: Fri, 10 Jul 2020 18:21:45 +0200 Subject: [PATCH] Fix toolchain caching: part 2 --- .github/workflows/ci.yml | 9 +++------ .github/workflows/gen_docs.yml | 15 ++++++--------- 2 files changed, 9 insertions(+), 15 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 8ec0133..1b83a30 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -15,12 +15,9 @@ jobs: with: path: | ~/.rustup/toolchains - key: toolchain-test-${{ hashFiles('rust-toolchain') }} - - - name: Install nightly toolchain - uses: actions-rs/toolchain@v1 - with: - profile: minimal + ~/.rustup/update-hashes + ~/.rustup/settings.toml + key: toolchain-test2-${{ hashFiles('rust-toolchain') }} - name: Cache dependencies uses: actions/cache@v2 diff --git a/.github/workflows/gen_docs.yml b/.github/workflows/gen_docs.yml index 3c8b7f3..39f055c 100644 --- a/.github/workflows/gen_docs.yml +++ b/.github/workflows/gen_docs.yml @@ -14,13 +14,10 @@ jobs: uses: actions/cache@v2 with: path: | - ~/.rustup - key: toolchain-${{ hashFiles('rust-toolchain') }} - - - name: Install nightly toolchain - uses: actions-rs/toolchain@v1 - with: - profile: minimal + ~/.rustup/toolchains + ~/.rustup/update-hashes + ~/.rustup/settings.toml + key: toolchain-test2-${{ hashFiles('rust-toolchain') }} - name: Cache dependencies uses: actions/cache@v2 @@ -36,9 +33,9 @@ jobs: path: | target/.rustc_info.json target/debug - key: target-${{ github.run_number }} + key: target-debug-${{ github.run_number }} restore-keys: | - target- + target-debug- - name: Cache docs uses: actions/cache@v2