diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 7dba4f0ec..10a9f24fb 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -244,6 +244,7 @@ jobs: uses: Swatinem/rust-cache@v2 with: key: clippy-${{ matrix.target }}-${{ matrix.kind }}-${{ env.CACHE_SUFFIX }} + env-vars: ImageVersion save-if: ${{ github.ref == 'refs/heads/trunk' }} - name: (Linux `aarch64`) Install `aarch64-linux-gnu` `g++` @@ -417,6 +418,7 @@ jobs: uses: Swatinem/rust-cache@v2 with: key: wgpu-msrv-check-${{ matrix.target }}-${{ env.CACHE_SUFFIX }} + env-vars: ImageVersion save-if: ${{ github.ref == 'refs/heads/trunk' }} - name: Reduce MSRV on dependencies @@ -490,6 +492,7 @@ jobs: uses: Swatinem/rust-cache@v2 with: key: core-msrv-check-${{ matrix.target }}-${{ env.CACHE_SUFFIX }} + env-vars: ImageVersion save-if: ${{ github.ref == 'refs/heads/trunk' }} - name: Reduce MSRV on dependencies @@ -638,6 +641,7 @@ jobs: uses: Swatinem/rust-cache@v2 with: key: test-${{ matrix.os }}-${{ env.CACHE_SUFFIX }} + env-vars: ImageVersion save-if: ${{ github.ref == 'refs/heads/trunk' }} workspaces: | . -> target @@ -750,6 +754,7 @@ jobs: uses: Swatinem/rust-cache@v2 with: key: doctests-${{ env.CACHE_SUFFIX }} + env-vars: ImageVersion save-if: ${{ github.ref == 'refs/heads/trunk' }} - name: Run doctests @@ -782,6 +787,7 @@ jobs: uses: Swatinem/rust-cache@v2 with: key: miri-${{ env.CACHE_SUFFIX }} + env-vars: ImageVersion save-if: ${{ github.ref == 'refs/heads/trunk' }} - name: Run Miri on selected tests @@ -864,6 +870,7 @@ jobs: uses: Swatinem/rust-cache@v2 with: key: cts-runner-${{ env.CACHE_SUFFIX }} + env-vars: ImageVersion save-if: ${{ github.ref == 'refs/heads/trunk' }} - name: Build Deno diff --git a/.github/workflows/cts.yml b/.github/workflows/cts.yml index ed7ac71cb..6e4fcfe55 100644 --- a/.github/workflows/cts.yml +++ b/.github/workflows/cts.yml @@ -100,6 +100,7 @@ jobs: with: # The version number can be incremented for cache busting. prefix-key: v3-rust-${{ hashFiles('cts_runner/revision.txt') }} + env-vars: ImageVersion cache-directories: cts # Save the cache from the `other` job because it also runs the cts_runner # integration tests. diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index 0586dcab9..37580b96c 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -57,6 +57,7 @@ jobs: uses: Swatinem/rust-cache@v2 with: key: doc-build + env-vars: ImageVersion save-if: ${{ github.ref == 'refs/heads/trunk' }} - name: Build the docs diff --git a/.github/workflows/generate.yml b/.github/workflows/generate.yml index a791e2496..032308c6a 100644 --- a/.github/workflows/generate.yml +++ b/.github/workflows/generate.yml @@ -72,6 +72,7 @@ jobs: uses: Swatinem/rust-cache@v2 with: key: cargo-generate-${{ matrix.name }} + env-vars: ImageVersion save-if: ${{ github.ref == 'refs/heads/trunk' }} - name: Install `cargo-generate` diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 68c7d6214..70ea39c1d 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -62,6 +62,7 @@ jobs: uses: Swatinem/rust-cache@v2 with: key: publish-build + env-vars: ImageVersion save-if: ${{ github.ref == 'refs/heads/trunk' }} - name: Build examples diff --git a/.github/workflows/shaders.yml b/.github/workflows/shaders.yml index 45619e538..f8435ae4e 100644 --- a/.github/workflows/shaders.yml +++ b/.github/workflows/shaders.yml @@ -39,6 +39,7 @@ jobs: - uses: Swatinem/rust-cache@v2 with: + env-vars: ImageVersion save-if: ${{ github.ref == 'refs/heads/trunk' }} # We must have the FXC job before the DXC job, so the DXC PATH has priority @@ -85,6 +86,7 @@ jobs: - uses: Swatinem/rust-cache@v2 with: + env-vars: ImageVersion save-if: ${{ github.ref == 'refs/heads/trunk' }} - run: | @@ -115,6 +117,7 @@ jobs: - uses: Swatinem/rust-cache@v2 with: + env-vars: ImageVersion save-if: ${{ github.ref == 'refs/heads/trunk' }} - run: cd naga; cargo xtask validate spv