From 50cd72d5905a020500e912bc2913e0013e9cebab Mon Sep 17 00:00:00 2001
From: bjorn3 <bjorn3@users.noreply.github.com>
Date: Wed, 19 Aug 2020 14:14:32 +0200
Subject: [PATCH] Bump actions/cache to v2

---
 .github/workflows/main.yml | 22 +++++++++-------------
 1 file changed, 9 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 7196d55ab6eb..841e1a0870ed 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -17,25 +17,21 @@ jobs:
     - uses: actions/checkout@v2
 
     - name: Cache cargo installed crates
-      uses: actions/cache@v1.1.2
+      uses: actions/cache@v2
       with:
         path: ~/.cargo/bin
-        key: cargo-installed-crates2-${{ matrix.os }}
+        key: ${{ runner.os }}-cargo-installed-crates
 
-    - name: Cache cargo registry
-      uses: actions/cache@v1
+    - name: Cache cargo registry and index
+      uses: actions/cache@v2
       with:
-        path: ~/.cargo/registry
-        key: ${{ runner.os }}-cargo-registry2-${{ hashFiles('**/Cargo.lock') }}
-
-    - name: Cache cargo index
-      uses: actions/cache@v1
-      with:
-        path: ~/.cargo/git
-        key: ${{ runner.os }}-cargo-index-${{ hashFiles('**/Cargo.lock') }}
+        path: |
+            ~/.cargo/registry
+            ~/.cargo/git
+        key: ${{ runner.os }}-cargo-registry-and-index-${{ hashFiles('**/Cargo.lock') }}
 
     - name: Cache cargo target dir
-      uses: actions/cache@v1.1.2
+      uses: actions/cache@v2
       with:
         path: target
         key: ${{ runner.os }}-cargo-build-target-${{ hashFiles('rust-toolchain', '**/Cargo.lock') }}