Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Pin rust-cache-version #5040

Merged
merged 1 commit into from
Jan 11, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 12 additions & 7 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down Expand Up @@ -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 }}

Expand Down Expand Up @@ -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 }}

Expand Down Expand Up @@ -333,7 +335,7 @@ jobs:
name: Test WebAssembly
runs-on: ubuntu-latest
needs: [check]

steps:
- name: checkout repo
uses: actions/checkout@v4
Expand Down Expand Up @@ -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: |
Expand Down Expand Up @@ -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 }}

Expand Down Expand Up @@ -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 }}

Expand Down
16 changes: 9 additions & 7 deletions .github/workflows/shaders.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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
Expand All @@ -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"

Expand All @@ -66,15 +67,16 @@ 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

- run: |
cd naga
cargo xtask validate msl

naga-validate-linux:
name: "Validate: SPIR-V/GLSL/DOT/WGSL"
runs-on: ubuntu-latest
Expand All @@ -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
Expand All @@ -96,4 +99,3 @@ jobs:
- run: cd naga; cargo xtask validate dot

- run: cd naga; cargo xtask validate wgsl