Skip to content

Commit 77e41ca

Browse files
authored
Merge branch 'main' into canvas-v2
Signed-off-by: Leo Kettmeir <[email protected]>
2 parents 59ab572 + f47ad1f commit 77e41ca

File tree

67 files changed

+463
-219
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

67 files changed

+463
-219
lines changed

.github/workflows/ci.generate.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import { stringify } from "jsr:@std/yaml@^0.221/stringify";
55
// Bump this number when you want to purge the cache.
66
// Note: the tools/release/01_bump_crate_versions.ts script will update this version
77
// automatically via regex, so ensure that this line maintains this format.
8-
const cacheVersion = 88;
8+
const cacheVersion = 89;
99

1010
const ubuntuX86Runner = "ubuntu-24.04";
1111
const ubuntuX86XlRunner = "ghcr.io/cirruslabs/ubuntu-runner-amd64:24.04";

.github/workflows/ci.yml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -173,8 +173,8 @@ jobs:
173173
~/.cargo/registry/index
174174
~/.cargo/registry/cache
175175
~/.cargo/git/db
176-
key: '88-cargo-home-${{ matrix.os }}-${{ matrix.arch }}-${{ hashFiles(''Cargo.lock'') }}'
177-
restore-keys: '88-cargo-home-${{ matrix.os }}-${{ matrix.arch }}-'
176+
key: '89-cargo-home-${{ matrix.os }}-${{ matrix.arch }}-${{ hashFiles(''Cargo.lock'') }}'
177+
restore-keys: '89-cargo-home-${{ matrix.os }}-${{ matrix.arch }}-'
178178
if: '!(matrix.skip)'
179179
- uses: dsherret/rust-toolchain-file@v1
180180
if: '!(matrix.skip)'
@@ -379,7 +379,7 @@ jobs:
379379
!./target/*/*.zip
380380
!./target/*/*.tar.gz
381381
key: never_saved
382-
restore-keys: '88-cargo-target-${{ matrix.os }}-${{ matrix.arch }}-${{ matrix.profile }}-${{ matrix.job }}-'
382+
restore-keys: '89-cargo-target-${{ matrix.os }}-${{ matrix.arch }}-${{ matrix.profile }}-${{ matrix.job }}-'
383383
- name: Apply and update mtime cache
384384
if: '!(matrix.skip) && (!startsWith(github.ref, ''refs/tags/''))'
385385
uses: ./.github/mtime_cache
@@ -759,7 +759,7 @@ jobs:
759759
!./target/*/gn_root
760760
!./target/*/*.zip
761761
!./target/*/*.tar.gz
762-
key: '88-cargo-target-${{ matrix.os }}-${{ matrix.arch }}-${{ matrix.profile }}-${{ matrix.job }}-${{ github.sha }}'
762+
key: '89-cargo-target-${{ matrix.os }}-${{ matrix.arch }}-${{ matrix.profile }}-${{ matrix.job }}-${{ github.sha }}'
763763
lint:
764764
name: 'lint ${{ matrix.profile }} ${{ matrix.os }}-${{ matrix.arch }}'
765765
needs:
@@ -810,8 +810,8 @@ jobs:
810810
~/.cargo/registry/index
811811
~/.cargo/registry/cache
812812
~/.cargo/git/db
813-
key: '88-cargo-home-${{ matrix.os }}-${{ matrix.arch }}-${{ hashFiles(''Cargo.lock'') }}'
814-
restore-keys: '88-cargo-home-${{ matrix.os }}-${{ matrix.arch }}-'
813+
key: '89-cargo-home-${{ matrix.os }}-${{ matrix.arch }}-${{ hashFiles(''Cargo.lock'') }}'
814+
restore-keys: '89-cargo-home-${{ matrix.os }}-${{ matrix.arch }}-'
815815
- uses: dsherret/rust-toolchain-file@v1
816816
- name: Install Deno
817817
uses: denoland/setup-deno@v2
@@ -828,7 +828,7 @@ jobs:
828828
!./target/*/*.zip
829829
!./target/*/*.tar.gz
830830
key: never_saved
831-
restore-keys: '88-cargo-target-${{ matrix.os }}-${{ matrix.arch }}-${{ matrix.profile }}-${{ matrix.job }}-'
831+
restore-keys: '89-cargo-target-${{ matrix.os }}-${{ matrix.arch }}-${{ matrix.profile }}-${{ matrix.job }}-'
832832
- name: test_format.js
833833
if: matrix.os == 'linux'
834834
run: deno run --allow-write --allow-read --allow-run --allow-net ./tools/format.js --check
@@ -848,7 +848,7 @@ jobs:
848848
!./target/*/gn_root
849849
!./target/*/*.zip
850850
!./target/*/*.tar.gz
851-
key: '88-cargo-target-${{ matrix.os }}-${{ matrix.arch }}-${{ matrix.profile }}-${{ matrix.job }}-${{ github.sha }}'
851+
key: '89-cargo-target-${{ matrix.os }}-${{ matrix.arch }}-${{ matrix.profile }}-${{ matrix.job }}-${{ github.sha }}'
852852
libs:
853853
name: build libs
854854
needs:

0 commit comments

Comments
 (0)