Use hash of Cargo.lock file in cache name

rust-lang · Jan 31, 2020 · ff49403 · ff49403
1 parent 55c33e6
commit ff49403
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 12 deletions.
diff --git a/.github/workflows/clippy.yml b/.github/workflows/clippy.yml
@@ -37,13 +37,17 @@ jobs:
  toolchain: nightly
  target: x86_64-unknown-linux-gnu
  profile: minimal
+ - name: Checkout
+ uses: actions/checkout@v2.0.0
+ - name: Run cargo update
+ run: cargo update
  - name: Cache cargo dir
  uses: actions/cache@v1
  with:
  path: ~/.cargo
- key: ${{ runner.os }}-x86_64-unknown-linux-gnu
- - name: Checkout
- uses: actions/checkout@v2.0.0
+ key: ${{ runner.os }}-x86_64-unknown-linux-gnu-${{ hashFiles('Cargo.lock') }}
+  restore-keys: |
+  ${{ runner.os }}-x86_64-unknown-linux-gnu
  - name: Master Toolchain Setup
  run: bash setup-toolchain.sh
 

diff --git a/.github/workflows/clippy_bors.yml b/.github/workflows/clippy_bors.yml
@@ -85,13 +85,17 @@ jobs:
  toolchain: nightly
  target: ${{ matrix.host }}
  profile: minimal
+ - name: Checkout
+ uses: actions/checkout@v2.0.0
+ - name: Run cargo update
+ run: cargo update
  - name: Cache cargo dir
  uses: actions/cache@v1
  with:
  path: ~/.cargo
- key: ${{ runner.os }}-${{ matrix.host }}
- - name: Checkout
- uses: actions/checkout@v2.0.0
+ key: ${{ runner.os }}-${{ matrix.host }}-${{ hashFiles('Cargo.lock') }}
+  restore-keys: |
+  ${{ runner.os }}-${{ matrix.host }}
  - name: Master Toolchain Setup
  run: bash setup-toolchain.sh
  env:
@@ -163,13 +167,17 @@ jobs:
  toolchain: nightly
  target: x86_64-unknown-linux-gnu
  profile: minimal
+ - name: Checkout
+ uses: actions/checkout@v2.0.0
+ - name: Run cargo update
+ run: cargo update
  - name: Cache cargo dir
  uses: actions/cache@v1
  with:
  path: ~/.cargo
- key: ${{ runner.os }}-x86_64-unknown-linux-gnu
- - name: Checkout
- uses: actions/checkout@v2.0.0
+ key: ${{ runner.os }}-x86_64-unknown-linux-gnu-${{ hashFiles('Cargo.lock') }}
+  restore-keys: |
+  ${{ runner.os }}-x86_64-unknown-linux-gnu
  - name: Master Toolchain Setup
  run: bash setup-toolchain.sh
 
@@ -226,13 +234,17 @@ jobs:
  toolchain: nightly
  target: x86_64-unknown-linux-gnu
  profile: minimal
+ - name: Checkout
+ uses: actions/checkout@v2.0.0
+ - name: Run cargo update
+ run: cargo update
  - name: Cache cargo dir
  uses: actions/cache@v1
  with:
  path: ~/.cargo
- key: ${{ runner.os }}-x86_64-unknown-linux-gnu
- - name: Checkout
- uses: actions/checkout@v2.0.0
+ key: ${{ runner.os }}-x86_64-unknown-linux-gnu-${{ hashFiles('Cargo.lock') }}
+  restore-keys: |
+  ${{ runner.os }}-x86_64-unknown-linux-gnu
  - name: Master Toolchain Setup
  run: bash setup-toolchain.sh