From 2512b2dae1e8a298bff92ce591adbaa6a3749ee2 Mon Sep 17 00:00:00 2001
From: Connor Fitzgerald <connorwadefitzgerald@gmail.com>
Date: Wed, 10 Jan 2024 20:57:51 -0500
Subject: [PATCH] Pin rust-cache-version (#5040)

---
 .github/workflows/ci.yml      | 19 ++++++++++++-------
 .github/workflows/shaders.yml | 16 +++++++++-------
 2 files changed, 21 insertions(+), 14 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index d9775d61c7..81d79f25e7 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -30,7 +30,7 @@ env:
   CI_BINARY_BUILD: "build18"
 
   # We sometimes need nightly to use special things in CI.
-  # 
+  #
   # In order to prevent CI regressions, we pin the nightly version.
   NIGHTLY_VERSION: "nightly-2023-12-17"
   # Version of rust used to build the docs with.
@@ -157,7 +157,8 @@ jobs:
           debug = false" >> .cargo/config.toml
 
       - name: caching
-        uses: Swatinem/rust-cache@v2
+        # Pin to 2.7.1 due to a bug in github actions cache action https://github.com/Swatinem/rust-cache/issues/182
+        uses: Swatinem/rust-cache@3cf7f8cc28d1b4e7d01e3783be10a97d55d483c8
         with:
           key: clippy-${{ matrix.target }}-${{ matrix.kind }}-${{ env.CACHE_SUFFIX }}
 
@@ -270,7 +271,8 @@ jobs:
           debug = false" >> .cargo/config.toml
 
       - name: caching
-        uses: Swatinem/rust-cache@v2
+        # Pin to 2.7.1 due to a bug in github actions cache action https://github.com/Swatinem/rust-cache/issues/182
+        uses: Swatinem/rust-cache@3cf7f8cc28d1b4e7d01e3783be10a97d55d483c8
         with:
           key: msrv-check-${{ matrix.target }}-${{ env.CACHE_SUFFIX }}
 
@@ -333,7 +335,7 @@ jobs:
     name: Test WebAssembly
     runs-on: ubuntu-latest
     needs: [check]
-    
+
     steps:
       - name: checkout repo
         uses: actions/checkout@v4
@@ -392,7 +394,8 @@ jobs:
         # Cache step must go before warp and mesa install on windows as they write into the
         # target directory, and rust-cache will overwrite the entirety of the target directory.
       - name: caching
-        uses: Swatinem/rust-cache@v2
+        # Pin to 2.7.1 due to a bug in github actions cache action https://github.com/Swatinem/rust-cache/issues/182
+        uses: Swatinem/rust-cache@3cf7f8cc28d1b4e7d01e3783be10a97d55d483c8
         with:
           key: test-${{ matrix.os }}-${{ env.CACHE_SUFFIX }}
           workspaces: |
@@ -560,7 +563,8 @@ jobs:
           debug = 1" >> .cargo/config.toml
 
       - name: caching
-        uses: Swatinem/rust-cache@v2
+        # Pin to 2.7.1 due to a bug in github actions cache action https://github.com/Swatinem/rust-cache/issues/182
+        uses: Swatinem/rust-cache@3cf7f8cc28d1b4e7d01e3783be10a97d55d483c8
         with:
           key: doctests-${{ env.CACHE_SUFFIX }}
 
@@ -611,7 +615,8 @@ jobs:
           debug = 1" >> .cargo/config.toml
 
       - name: caching
-        uses: Swatinem/rust-cache@v2
+        # Pin to 2.7.1 due to a bug in github actions cache action https://github.com/Swatinem/rust-cache/issues/182
+        uses: Swatinem/rust-cache@3cf7f8cc28d1b4e7d01e3783be10a97d55d483c8
         with:
           key: cts-runner-${{ env.CACHE_SUFFIX }}
 
diff --git a/.github/workflows/shaders.yml b/.github/workflows/shaders.yml
index d5acd990b6..7e4fe1aa72 100644
--- a/.github/workflows/shaders.yml
+++ b/.github/workflows/shaders.yml
@@ -9,7 +9,7 @@ on:
 
 env:
   # Sourced from https://github.com/microsoft/DirectXShaderCompiler/releases
-  # 
+  #
   # Must also be changed in ci.yaml
   DXC_RELEASE: "v1.7.2308"
   DXC_FILENAME: "dxc_2023_08_14.zip"
@@ -21,7 +21,8 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
-      - uses: Swatinem/rust-cache@v2
+      # Pin to 2.7.1 due to a bug in github actions cache action https://github.com/Swatinem/rust-cache/issues/182
+      - uses: Swatinem/rust-cache@3cf7f8cc28d1b4e7d01e3783be10a97d55d483c8
         with:
           workspaces: |
             naga/xtask -> naga/xtask/target
@@ -45,7 +46,7 @@ jobs:
 
           curl.exe -L --retry 5 https://github.com/microsoft/DirectXShaderCompiler/releases/download/$DXC_RELEASE/$DXC_FILENAME -o dxc.zip
           7z.exe e dxc.zip -odxc bin/x64/{dxc.exe,dxcompiler.dll,dxil.dll}
-          
+
           # We need to use cygpath to convert PWD to a windows path as we're using bash.
           cygpath --windows "$PWD/dxc" >> "$GITHUB_PATH"
 
@@ -66,7 +67,8 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
-      - uses: Swatinem/rust-cache@v2
+      # Pin to 2.7.1 due to a bug in github actions cache action https://github.com/Swatinem/rust-cache/issues/182
+      - uses: Swatinem/rust-cache@3cf7f8cc28d1b4e7d01e3783be10a97d55d483c8
         with:
           workspaces: |
             naga/xtask -> naga/xtask/target
@@ -74,7 +76,7 @@ jobs:
       - run: |
           cd naga
           cargo xtask validate msl
-      
+
   naga-validate-linux:
     name: "Validate: SPIR-V/GLSL/DOT/WGSL"
     runs-on: ubuntu-latest
@@ -84,7 +86,8 @@ jobs:
       - name: Install tools
         run: sudo apt-get install spirv-tools glslang-tools graphviz
 
-      - uses: Swatinem/rust-cache@v2
+      # Pin to 2.7.1 due to a bug in github actions cache action https://github.com/Swatinem/rust-cache/issues/182
+      - uses: Swatinem/rust-cache@3cf7f8cc28d1b4e7d01e3783be10a97d55d483c8
         with:
           workspaces: |
             naga/xtask -> naga/xtask/target
@@ -96,4 +99,3 @@ jobs:
       - run: cd naga; cargo xtask validate dot
 
       - run: cd naga; cargo xtask validate wgsl
-