Merge pull request #17 from CleanCut/sccache-windows

Use sccache on Windows

Author: CleanCut

.github/workflows/ci.yml

@@ -20,44 +20,18 @@ jobs:
       fail-fast: false
       matrix:
         os: [macos-latest, windows-latest, ubuntu-latest]
-        toolchain: [stable, beta, nightly]
+        toolchain: [stable]
         include:
           - os: macos-latest
             MACOS: true
-            sccache-path: /Users/runner/Library/Caches/Mozilla.sccache
-            sccache-download-target: apple-darwin
-            # This can be moved to the "env:" section below once sccache is also working on Windows
-            rustc_wrapper: sccache
           - os: windows-latest
           - os: ubuntu-latest
-            sccache-path: /home/runner/.cache/sccache
-            sccache-download-target: unknown-linux-musl
-            # This can be moved to the "env:" section below once sccache is also working on Windows
-            rustc_wrapper: sccache
     env:
       RUST_BACKTRACE: full
-      #RUSTC_WRAPPER: sccache  # Can't hard-code this until we've got Windows working, too
-      RUSTC_WRAPPER: ${{ matrix.rustc_wrapper }}
       RUSTV: ${{ matrix.toolchain }}
-      SCCACHE_CACHE_SIZE: 2G
-      SCCACHE_DIR: ${{ matrix.sccache-path }}
-      SCCACHE_TARGET: ${{ matrix.sccache-download-target }}
-      URL_BASE: https://github.com/mozilla/sccache/releases/download
-      SCCACHE_VERSION: v0.2.15
-      # SCCACHE_RECACHE: 1 # Uncomment this to clear cache, then comment it back out
     steps:
       - uses: actions/checkout@v2
 
-      - name: Install sccache
-        run: |
-          SCCACHE_FILE=sccache-$SCCACHE_VERSION-x86_64-$SCCACHE_TARGET
-          mkdir -p $HOME/.local/bin
-          curl -L "$URL_BASE/$SCCACHE_VERSION/$SCCACHE_FILE.tar.gz" | tar xz
-          mv -f $SCCACHE_FILE/sccache $HOME/.local/bin/sccache
-          chmod +x $HOME/.local/bin/sccache
-          echo "$HOME/.local/bin" >> $GITHUB_PATH
-        if: matrix.os != 'windows-latest'
-
       - name: Install Linux deps alsa and udev
         run: sudo apt-get update; sudo apt-get install --no-install-recommends libasound2-dev libudev-dev
         if: runner.os == 'linux'
@@ -72,31 +46,32 @@ jobs:
           override: true
 
       - name: Fetch cargo registry cache
-        uses: actions/cache@v2
+        uses: actions/cache@v3
         continue-on-error: false
         with:
           path: |
-            ~/.cargo/registry
-            ~/.cargo/git
+            ~/.cargo/bin/
+            ~/.cargo/registry/index/
+            ~/.cargo/registry/cache/
+            ~/.cargo/git/db/
+            target/
             Cargo.lock
-          key: ${{ runner.os }}-cargo-${{ matrix.toolchain }}-${{ hashFiles('**/Cargo.toml') }}
-          restore-keys: |
-            ${{ runner.os }}-cargo-${{ matrix.toolchain }}-
-        if: matrix.os != 'windows-latest'
+          key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
+        if: runner.os != 'windows'
 
-      - name: Fetch sccache cache
-        uses: actions/cache@v2
+      - name: Fetch cargo registry cache (windows)
+        uses: actions/cache@v3
         continue-on-error: false
         with:
-          path: ${{ matrix.sccache-path }}
-          key: ${{ runner.os }}-sccache-${{ matrix.toolchain }}-${{ hashFiles('**/Cargo.toml') }}
-          restore-keys: |
-            ${{ runner.os }}-sccache-${{ matrix.toolchain }}-
-        if: matrix.os != 'windows-latest'
-
-      - name: Start sccache server
-        run: sccache --start-server
-        if: matrix.os != 'windows-latest'
+          path: |
+            C:\Rust\.cargo\bin
+            C:\Rust\.cargo\registry\index
+            C:\Rust\.cargo\registry\cache
+            C:\Rust\.cargo\git\db
+            target
+            Cargo.lock
+          key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
+        if: runner.os == 'windows'
 
       - name: rustfmt & clippy
         run: |
@@ -108,7 +83,3 @@ jobs:
       - run: cargo test --workspace --all-targets --all-features
         env:
           MACOS: ${{ matrix.MACOS }} # Used by some tests
-
-      - name: Stop sccache server
-        run: sccache --stop-server || true
-        if: matrix.os != 'windows-latest'

CHANGELOG.md

@@ -6,6 +6,7 @@
 - Fixed `CollisionPair::either_contains` to use `.contains` instead of `==`, contributed by [@etnt](https://github.com/etnt) in [#51](https://github.com/CleanCut/rusty_engine/pull/51)
 - Added `CollisionPair::either_equals_to` which uses `==`, contributed by [@etnt](https://github.com/etnt) in [#51](https://github.com/CleanCut/rusty_engine/pull/51)
 - Fixed documentation for a few fields of the `Engine` struct which were in the wrong place.
+- Improved CI caching. Builds should now generally complete in under 3 minutes.
 
 ## [5.0.6] - 2022-05-19