Skip to content

Commit 20facaf

Browse files
authored
Merge branch 'main' into worker_shared_cache
Signed-off-by: Divy Srivastava <[email protected]>
2 parents a425210 + 6084cf6 commit 20facaf

File tree

968 files changed

+7597
-4957
lines changed

Some content is hidden

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

968 files changed

+7597
-4957
lines changed

.dprint.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
"cli/tsc/dts/lib.es*.d.ts",
2929
"cli/tsc/dts/typescript.d.ts",
3030
"tests/node_compat/test",
31+
"tests/registry/",
3132
"tests/testdata/file_extensions/ts_with_js_extension.js",
3233
"tests/testdata/fmt/badly_formatted.json",
3334
"tests/testdata/fmt/badly_formatted.md",
@@ -41,7 +42,6 @@
4142
"tests/testdata/run/error_syntax_empty_trailing_line.mjs",
4243
"tests/testdata/run/inline_js_source_map*",
4344
"tests/testdata/malformed_config/",
44-
"tests/testdata/npm/registry/",
4545
"tests/testdata/test/markdown_windows.md",
4646
"cli/tsc/*typescript.js",
4747
"gh-pages",
@@ -57,7 +57,7 @@
5757
"ext/websocket/autobahn/reports"
5858
],
5959
"plugins": [
60-
"https://plugins.dprint.dev/typescript-0.90.4.wasm",
60+
"https://plugins.dprint.dev/typescript-0.90.5.wasm",
6161
"https://plugins.dprint.dev/json-0.19.2.wasm",
6262
"https://plugins.dprint.dev/markdown-0.17.0.wasm",
6363
"https://plugins.dprint.dev/toml-0.6.1.wasm",

.github/workflows/ci.generate.ts

Lines changed: 2 additions & 3 deletions
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 = 87;
8+
const cacheVersion = 89;
99

1010
const ubuntuX86Runner = "ubuntu-22.04";
1111
const ubuntuX86XlRunner = "ubuntu-22.04-xl";
@@ -489,8 +489,7 @@ const ci = {
489489
)
490490
),
491491
{
492-
// only necessary for benchmarks
493-
if: "matrix.job == 'bench'",
492+
if: "matrix.job == 'bench' || matrix.job == 'test'",
494493
...installNodeStep,
495494
},
496495
installProtocStep,

.github/workflows/ci.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -194,7 +194,7 @@ jobs:
194194
Where-Object { Test-Path "$_\python.exe" } |
195195
Select-Object -Skip 1 |
196196
ForEach-Object { Move-Item "$_" "$_.disabled" }
197-
- if: '!(matrix.skip) && (matrix.job == ''bench'')'
197+
- if: '!(matrix.skip) && (matrix.job == ''bench'' || matrix.job == ''test'')'
198198
name: Install Node
199199
uses: actions/setup-node@v4
200200
with:
@@ -366,8 +366,8 @@ jobs:
366366
path: |-
367367
~/.cargo/registry/index
368368
~/.cargo/registry/cache
369-
key: '87-cargo-home-${{ matrix.os }}-${{ matrix.arch }}-${{ hashFiles(''Cargo.lock'') }}'
370-
restore-keys: '87-cargo-home-${{ matrix.os }}-${{ matrix.arch }}'
369+
key: '89-cargo-home-${{ matrix.os }}-${{ matrix.arch }}-${{ hashFiles(''Cargo.lock'') }}'
370+
restore-keys: '89-cargo-home-${{ matrix.os }}-${{ matrix.arch }}'
371371
if: '!(matrix.skip)'
372372
- name: Restore cache build output (PR)
373373
uses: actions/cache/restore@v4
@@ -379,7 +379,7 @@ jobs:
379379
!./target/*/*.zip
380380
!./target/*/*.tar.gz
381381
key: never_saved
382-
restore-keys: '87-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
@@ -668,7 +668,7 @@ jobs:
668668
!./target/*/gn_out
669669
!./target/*/*.zip
670670
!./target/*/*.tar.gz
671-
key: '87-cargo-target-${{ matrix.os }}-${{ matrix.arch }}-${{ matrix.profile }}-${{ matrix.job }}-${{ github.sha }}'
671+
key: '89-cargo-target-${{ matrix.os }}-${{ matrix.arch }}-${{ matrix.profile }}-${{ matrix.job }}-${{ github.sha }}'
672672
publish-canary:
673673
name: publish canary
674674
runs-on: ubuntu-22.04

0 commit comments

Comments
 (0)