Improve caching of CI

librespot-org · Apr 9, 2021 · 9979616 · 9979616
1 parent e947ccf
commit 9979616
Showing 1 changed file with 20 additions and 5 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -44,7 +44,7 @@ jobs:
           components: rustfmt
       - run: cargo fmt --all -- --check
 
-  test:
+  test-linux:
     needs: fmt
     name: cargo +${{ matrix.toolchain }} build (${{ matrix.os }})
     runs-on: ${{ matrix.os }}
@@ -74,6 +74,11 @@ jobs:
           toolchain: ${{ matrix.toolchain }}
           override: true
 
+      - name: Get Rustc version
+        id: get-rustc-version
+        run: echo "::set-output name=version::$(rustc -V)"
+        shell: bash
+
       - name: Cache Rust dependencies
         uses: actions/cache@v2
         with:
@@ -82,7 +87,7 @@ jobs:
             ~/.cargo/registry/cache
             ~/.cargo/git
             target
-          key: ${{ runner.os }}-build-${{ hashFiles('**/Cargo.lock') }}
+          key: ${{ runner.os }}-${{ steps.get-rustc-version.outputs.version }}-${{ hashFiles('**/Cargo.lock') }}
 
       - name: Install developer package dependencies
         run: sudo apt-get update && sudo apt-get install libpulse-dev portaudio19-dev libasound2-dev libsdl2-dev gstreamer1.0-dev libgstreamer-plugins-base1.0-dev libavahi-compat-libdnssd-dev
@@ -93,7 +98,7 @@ jobs:
       - run: cargo install cargo-hack
       - run: cargo hack  --workspace --remove-dev-deps
       - run: cargo build -p librespot-core --no-default-features
-      - run: cargo build -p librespot-core 
+      - run: cargo build -p librespot-core
       - run: cargo hack build --each-feature -p librespot-audio
       - run: cargo build -p librespot-connect
       - run: cargo build -p librespot-connect --no-default-features --features with-dns-sd
@@ -119,6 +124,11 @@ jobs:
           profile: minimal
           override: true
 
+      - name: Get Rustc version
+        id: get-rustc-version
+        run: echo "::set-output name=version::$(rustc -V)"
+        shell: bash
+
       - name: Cache Rust dependencies
         uses: actions/cache@v2
         with:
@@ -127,7 +137,7 @@ jobs:
             ~/.cargo/registry/cache
             ~/.cargo/git
             target
-          key: ${{ runner.os }}-build-${{ hashFiles('**/Cargo.lock') }}
+          key: ${{ runner.os }}-${{ steps.get-rustc-version.outputs.version }}-${{ hashFiles('**/Cargo.lock') }}
 
       - run: cargo build --workspace --examples
       - run: cargo test --workspace
@@ -162,6 +172,11 @@ jobs:
           toolchain: ${{ matrix.toolchain }}
           override: true
 
+      - name: Get Rustc version
+        id: get-rustc-version
+        run: echo "::set-output name=version::$(rustc -V)"
+        shell: bash
+
       - name: Cache Rust dependencies
         uses: actions/cache@v2
         with:
@@ -170,7 +185,7 @@ jobs:
             ~/.cargo/registry/cache
             ~/.cargo/git
             target
-          key: ${{ runner.os }}-build-${{ matrix.target }}-${{ hashFiles('**/Cargo.lock') }}
+          key: ${{ runner.os }}-${{ matrix.target }}-${{ steps.get-rustc-version.outputs.version }}-${{ hashFiles('**/Cargo.lock') }}
       - name: Install cross
         run: cargo install cross || true
       - name: Build