summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLeo Kettmeir <crowlkats@toaxl.com>2023-12-07 22:10:32 +0100
committerGitHub <noreply@github.com>2023-12-07 22:10:32 +0100
commit3724d44d59950040f6ebbdd87d7eb93bc59c3caa (patch)
tree00e3396c819704653bc5f9dd5e5a6d0b27d4f222
parent78566753c81a26dc1855d8187c8192ffb1ba64e2 (diff)
chore: bump rust to 1.74.1 (#21499)
-rwxr-xr-x.github/workflows/ci.generate.ts2
-rw-r--r--.github/workflows/ci.yml8
-rw-r--r--rust-toolchain.toml2
3 files changed, 6 insertions, 6 deletions
diff --git a/.github/workflows/ci.generate.ts b/.github/workflows/ci.generate.ts
index 37a473cab..bad5532ad 100755
--- a/.github/workflows/ci.generate.ts
+++ b/.github/workflows/ci.generate.ts
@@ -5,7 +5,7 @@ import * as yaml from "https://deno.land/std@0.173.0/encoding/yaml.ts";
// Bump this number when you want to purge the cache.
// Note: the tools/release/01_bump_crate_versions.ts script will update this version
// automatically via regex, so ensure that this line maintains this format.
-const cacheVersion = 62;
+const cacheVersion = 63;
const ubuntuRunner = "ubuntu-22.04";
const ubuntuXlRunner = "ubuntu-22.04-xl";
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 88e194b0c..80f8005b8 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -329,8 +329,8 @@ jobs:
path: |-
~/.cargo/registry/index
~/.cargo/registry/cache
- key: '62-cargo-home-${{ matrix.os }}-${{ hashFiles(''Cargo.lock'') }}'
- restore-keys: '62-cargo-home-${{ matrix.os }}'
+ key: '63-cargo-home-${{ matrix.os }}-${{ hashFiles(''Cargo.lock'') }}'
+ restore-keys: '63-cargo-home-${{ matrix.os }}'
if: '!(matrix.skip)'
- name: Restore cache build output (PR)
uses: actions/cache/restore@v3
@@ -342,7 +342,7 @@ jobs:
!./target/*/*.zip
!./target/*/*.tar.gz
key: never_saved
- restore-keys: '62-cargo-target-${{ matrix.os }}-${{ matrix.profile }}-${{ matrix.job }}-'
+ restore-keys: '63-cargo-target-${{ matrix.os }}-${{ matrix.profile }}-${{ matrix.job }}-'
- name: Apply and update mtime cache
if: '!(matrix.skip) && (!startsWith(github.ref, ''refs/tags/''))'
uses: ./.github/mtime_cache
@@ -639,7 +639,7 @@ jobs:
!./target/*/gn_out
!./target/*/*.zip
!./target/*/*.tar.gz
- key: '62-cargo-target-${{ matrix.os }}-${{ matrix.profile }}-${{ matrix.job }}-${{ github.sha }}'
+ key: '63-cargo-target-${{ matrix.os }}-${{ matrix.profile }}-${{ matrix.job }}-${{ github.sha }}'
publish-canary:
name: publish canary
runs-on: ubuntu-22.04
diff --git a/rust-toolchain.toml b/rust-toolchain.toml
index 9e137c1e6..4bd1ede5b 100644
--- a/rust-toolchain.toml
+++ b/rust-toolchain.toml
@@ -1,3 +1,3 @@
[toolchain]
-channel = "1.74.0"
+channel = "1.74.1"
components = ["rustfmt", "clippy"]