Skip to content

Commit 80aec1d

Browse files
Merge pull request #705 from denoland/main
Create a new pull request by comparing changes across two branches
2 parents 1c73634 + 742744d commit 80aec1d

File tree

1,988 files changed

+15206
-5781
lines changed

Some content is hidden

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

1,988 files changed

+15206
-5781
lines changed

.dprint.json

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,10 +65,14 @@
6565
"tests/wpt/runner/expectation.json",
6666
"tests/wpt/runner/manifest.json",
6767
"tests/wpt/suite",
68-
"third_party"
68+
"third_party",
69+
"tests/specs/run/shebang_with_json_imports_tsc",
70+
"tests/specs/run/shebang_with_json_imports_swc",
71+
"tests/specs/run/ext_flag_takes_precedence_over_extension",
72+
"tests/specs/run/error_syntax_empty_trailing_line/error_syntax_empty_trailing_line.mjs"
6973
],
7074
"plugins": [
71-
"https://plugins.dprint.dev/typescript-0.93.0.wasm",
75+
"https://plugins.dprint.dev/typescript-0.93.2.wasm",
7276
"https://plugins.dprint.dev/json-0.19.4.wasm",
7377
"https://plugins.dprint.dev/markdown-0.17.8.wasm",
7478
"https://plugins.dprint.dev/toml-0.6.3.wasm",

.github/workflows/cargo_publish.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ concurrency:
1010
jobs:
1111
build:
1212
name: cargo publish
13-
runs-on: ubuntu-20.04-xl
13+
runs-on: ubuntu-24.04-xl
1414
timeout-minutes: 90
1515

1616
env:

.github/workflows/ci.generate.ts

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,16 @@ 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 = 22;
8+
const cacheVersion = 24;
99

10-
const ubuntuX86Runner = "ubuntu-22.04";
11-
const ubuntuX86XlRunner = "ubuntu-22.04-xl";
10+
const ubuntuX86Runner = "ubuntu-24.04";
11+
const ubuntuX86XlRunner = "ubuntu-24.04-xl";
1212
const ubuntuARMRunner = "ubicloud-standard-16-arm";
1313
const windowsX86Runner = "windows-2022";
1414
const windowsX86XlRunner = "windows-2022-xl";
1515
const macosX86Runner = "macos-13";
1616
const macosArmRunner = "macos-14";
17+
const selfHostedMacosArmRunner = "self-hosted";
1718

1819
const Runners = {
1920
linuxX86: {
@@ -40,7 +41,8 @@ const Runners = {
4041
macosArm: {
4142
os: "macos",
4243
arch: "aarch64",
43-
runner: macosArmRunner,
44+
runner:
45+
`\${{ github.repository == 'denoland/deno' && startsWith(github.ref, 'refs/tags/') && '${selfHostedMacosArmRunner}' || '${macosArmRunner}' }}`,
4446
},
4547
windowsX86: {
4648
os: "windows",
@@ -59,7 +61,7 @@ const prCacheKeyPrefix =
5961
`${cacheVersion}-cargo-target-\${{ matrix.os }}-\${{ matrix.arch }}-\${{ matrix.profile }}-\${{ matrix.job }}-`;
6062

6163
// Note that you may need to add more version to the `apt-get remove` line below if you change this
62-
const llvmVersion = 18;
64+
const llvmVersion = 19;
6365
const installPkgsCommand =
6466
`sudo apt-get install --no-install-recommends clang-${llvmVersion} lld-${llvmVersion} clang-tools-${llvmVersion} clang-format-${llvmVersion} clang-tidy-${llvmVersion}`;
6567
const sysRootStep = {
@@ -71,7 +73,7 @@ export DEBIAN_FRONTEND=noninteractive
7173
sudo apt-get -qq remove --purge -y man-db > /dev/null 2> /dev/null
7274
# Remove older clang before we install
7375
sudo apt-get -qq remove \
74-
'clang-12*' 'clang-13*' 'clang-14*' 'clang-15*' 'clang-16*' 'llvm-12*' 'llvm-13*' 'llvm-14*' 'llvm-15*' 'llvm-16*' 'lld-12*' 'lld-13*' 'lld-14*' 'lld-15*' 'lld-16*' > /dev/null 2> /dev/null
76+
'clang-12*' 'clang-13*' 'clang-14*' 'clang-15*' 'clang-16*' 'clang-17*' 'clang-18*' 'llvm-12*' 'llvm-13*' 'llvm-14*' 'llvm-15*' 'llvm-16*' 'lld-12*' 'lld-13*' 'lld-14*' 'lld-15*' 'lld-16*' 'lld-17*' 'lld-18*' > /dev/null 2> /dev/null
7577
7678
# Install clang-XXX, lld-XXX, and debootstrap.
7779
echo "deb http://apt.llvm.org/jammy/ llvm-toolchain-jammy-${llvmVersion} main" |
@@ -86,7 +88,7 @@ ${installPkgsCommand} || echo 'Failed. Trying again.' && sudo apt-get clean && s
8688
(yes '' | sudo update-alternatives --force --all) > /dev/null 2> /dev/null || true
8789
8890
echo "Decompressing sysroot..."
89-
wget -q https://github.com/denoland/deno_sysroot_build/releases/download/sysroot-20240528/sysroot-\`uname -m\`.tar.xz -O /tmp/sysroot.tar.xz
91+
wget -q https://github.com/denoland/deno_sysroot_build/releases/download/sysroot-20241030/sysroot-\`uname -m\`.tar.xz -O /tmp/sysroot.tar.xz
9092
cd /
9193
xzcat /tmp/sysroot.tar.xz | sudo tar -x
9294
sudo mount --rbind /dev /sysroot/dev

.github/workflows/ci.yml

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -62,18 +62,18 @@ jobs:
6262
profile: debug
6363
- os: macos
6464
arch: x86_64
65-
runner: '${{ (!contains(github.event.pull_request.labels.*.name, ''ci-full'') && (github.event_name == ''pull_request'')) && ''ubuntu-22.04'' || ''macos-13'' }}'
65+
runner: '${{ (!contains(github.event.pull_request.labels.*.name, ''ci-full'') && (github.event_name == ''pull_request'')) && ''ubuntu-24.04'' || ''macos-13'' }}'
6666
job: test
6767
profile: release
6868
skip: '${{ !contains(github.event.pull_request.labels.*.name, ''ci-full'') && (github.event_name == ''pull_request'') }}'
6969
- os: macos
7070
arch: aarch64
71-
runner: macos-14
71+
runner: '${{ github.repository == ''denoland/deno'' && startsWith(github.ref, ''refs/tags/'') && ''self-hosted'' || ''macos-14'' }}'
7272
job: test
7373
profile: debug
7474
- os: macos
7575
arch: aarch64
76-
runner: '${{ (!contains(github.event.pull_request.labels.*.name, ''ci-full'') && (github.event_name == ''pull_request'')) && ''ubuntu-22.04'' || ''macos-14'' }}'
76+
runner: '${{ (!contains(github.event.pull_request.labels.*.name, ''ci-full'') && (github.event_name == ''pull_request'')) && ''ubuntu-24.04'' || github.repository == ''denoland/deno'' && startsWith(github.ref, ''refs/tags/'') && ''self-hosted'' || ''macos-14'' }}'
7777
job: test
7878
profile: release
7979
skip: '${{ !contains(github.event.pull_request.labels.*.name, ''ci-full'') && (github.event_name == ''pull_request'') }}'
@@ -84,33 +84,33 @@ jobs:
8484
profile: debug
8585
- os: windows
8686
arch: x86_64
87-
runner: '${{ (!contains(github.event.pull_request.labels.*.name, ''ci-full'') && (github.event_name == ''pull_request'')) && ''ubuntu-22.04'' || github.repository == ''denoland/deno'' && ''windows-2022-xl'' || ''windows-2022'' }}'
87+
runner: '${{ (!contains(github.event.pull_request.labels.*.name, ''ci-full'') && (github.event_name == ''pull_request'')) && ''ubuntu-24.04'' || github.repository == ''denoland/deno'' && ''windows-2022-xl'' || ''windows-2022'' }}'
8888
job: test
8989
profile: release
9090
skip: '${{ !contains(github.event.pull_request.labels.*.name, ''ci-full'') && (github.event_name == ''pull_request'') }}'
9191
- os: linux
9292
arch: x86_64
93-
runner: '${{ github.repository == ''denoland/deno'' && ''ubuntu-22.04-xl'' || ''ubuntu-22.04'' }}'
93+
runner: '${{ github.repository == ''denoland/deno'' && ''ubuntu-24.04-xl'' || ''ubuntu-24.04'' }}'
9494
job: test
9595
profile: release
9696
use_sysroot: true
9797
wpt: '${{ !startsWith(github.ref, ''refs/tags/'') }}'
9898
- os: linux
9999
arch: x86_64
100-
runner: '${{ (!contains(github.event.pull_request.labels.*.name, ''ci-full'') && (github.event_name == ''pull_request'' && !contains(github.event.pull_request.labels.*.name, ''ci-bench''))) && ''ubuntu-22.04'' || github.repository == ''denoland/deno'' && ''ubuntu-22.04-xl'' || ''ubuntu-22.04'' }}'
100+
runner: '${{ (!contains(github.event.pull_request.labels.*.name, ''ci-full'') && (github.event_name == ''pull_request'' && !contains(github.event.pull_request.labels.*.name, ''ci-bench''))) && ''ubuntu-24.04'' || github.repository == ''denoland/deno'' && ''ubuntu-24.04-xl'' || ''ubuntu-24.04'' }}'
101101
job: bench
102102
profile: release
103103
use_sysroot: true
104104
skip: '${{ !contains(github.event.pull_request.labels.*.name, ''ci-full'') && (github.event_name == ''pull_request'' && !contains(github.event.pull_request.labels.*.name, ''ci-bench'')) }}'
105105
- os: linux
106106
arch: x86_64
107-
runner: ubuntu-22.04
107+
runner: ubuntu-24.04
108108
job: test
109109
profile: debug
110110
use_sysroot: true
111111
- os: linux
112112
arch: x86_64
113-
runner: ubuntu-22.04
113+
runner: ubuntu-24.04
114114
job: lint
115115
profile: debug
116116
- os: linux
@@ -252,22 +252,22 @@ jobs:
252252
# to complete.
253253
sudo apt-get -qq remove --purge -y man-db > /dev/null 2> /dev/null
254254
# Remove older clang before we install
255-
sudo apt-get -qq remove 'clang-12*' 'clang-13*' 'clang-14*' 'clang-15*' 'clang-16*' 'llvm-12*' 'llvm-13*' 'llvm-14*' 'llvm-15*' 'llvm-16*' 'lld-12*' 'lld-13*' 'lld-14*' 'lld-15*' 'lld-16*' > /dev/null 2> /dev/null
255+
sudo apt-get -qq remove 'clang-12*' 'clang-13*' 'clang-14*' 'clang-15*' 'clang-16*' 'clang-17*' 'clang-18*' 'llvm-12*' 'llvm-13*' 'llvm-14*' 'llvm-15*' 'llvm-16*' 'lld-12*' 'lld-13*' 'lld-14*' 'lld-15*' 'lld-16*' 'lld-17*' 'lld-18*' > /dev/null 2> /dev/null
256256
257257
# Install clang-XXX, lld-XXX, and debootstrap.
258-
echo "deb http://apt.llvm.org/jammy/ llvm-toolchain-jammy-18 main" |
259-
sudo dd of=/etc/apt/sources.list.d/llvm-toolchain-jammy-18.list
258+
echo "deb http://apt.llvm.org/jammy/ llvm-toolchain-jammy-19 main" |
259+
sudo dd of=/etc/apt/sources.list.d/llvm-toolchain-jammy-19.list
260260
curl https://apt.llvm.org/llvm-snapshot.gpg.key |
261261
gpg --dearmor |
262262
sudo dd of=/etc/apt/trusted.gpg.d/llvm-snapshot.gpg
263263
sudo apt-get update
264264
# this was unreliable sometimes, so try again if it fails
265-
sudo apt-get install --no-install-recommends clang-18 lld-18 clang-tools-18 clang-format-18 clang-tidy-18 || echo 'Failed. Trying again.' && sudo apt-get clean && sudo apt-get update && sudo apt-get install --no-install-recommends clang-18 lld-18 clang-tools-18 clang-format-18 clang-tidy-18
265+
sudo apt-get install --no-install-recommends clang-19 lld-19 clang-tools-19 clang-format-19 clang-tidy-19 || echo 'Failed. Trying again.' && sudo apt-get clean && sudo apt-get update && sudo apt-get install --no-install-recommends clang-19 lld-19 clang-tools-19 clang-format-19 clang-tidy-19
266266
# Fix alternatives
267267
(yes '' | sudo update-alternatives --force --all) > /dev/null 2> /dev/null || true
268268
269269
echo "Decompressing sysroot..."
270-
wget -q https://github.com/denoland/deno_sysroot_build/releases/download/sysroot-20240528/sysroot-`uname -m`.tar.xz -O /tmp/sysroot.tar.xz
270+
wget -q https://github.com/denoland/deno_sysroot_build/releases/download/sysroot-20241030/sysroot-`uname -m`.tar.xz -O /tmp/sysroot.tar.xz
271271
cd /
272272
xzcat /tmp/sysroot.tar.xz | sudo tar -x
273273
sudo mount --rbind /dev /sysroot/dev
@@ -299,8 +299,8 @@ jobs:
299299
CARGO_PROFILE_RELEASE_LTO=false
300300
RUSTFLAGS<<__1
301301
-C linker-plugin-lto=true
302-
-C linker=clang-18
303-
-C link-arg=-fuse-ld=lld-18
302+
-C linker=clang-19
303+
-C link-arg=-fuse-ld=lld-19
304304
-C link-arg=-ldl
305305
-C link-arg=-Wl,--allow-shlib-undefined
306306
-C link-arg=-Wl,--thinlto-cache-dir=$(pwd)/target/release/lto-cache
@@ -310,16 +310,16 @@ jobs:
310310
__1
311311
RUSTDOCFLAGS<<__1
312312
-C linker-plugin-lto=true
313-
-C linker=clang-18
314-
-C link-arg=-fuse-ld=lld-18
313+
-C linker=clang-19
314+
-C link-arg=-fuse-ld=lld-19
315315
-C link-arg=-ldl
316316
-C link-arg=-Wl,--allow-shlib-undefined
317317
-C link-arg=-Wl,--thinlto-cache-dir=$(pwd)/target/release/lto-cache
318318
-C link-arg=-Wl,--thinlto-cache-policy,cache_size_bytes=700m
319319
--cfg tokio_unstable
320320
$RUSTFLAGS
321321
__1
322-
CC=/usr/bin/clang-18
322+
CC=/usr/bin/clang-19
323323
CFLAGS=-flto=thin $CFLAGS
324324
" > $GITHUB_ENV
325325
- name: Remove macOS cURL --ipv4 flag
@@ -361,8 +361,8 @@ jobs:
361361
path: |-
362362
~/.cargo/registry/index
363363
~/.cargo/registry/cache
364-
key: '22-cargo-home-${{ matrix.os }}-${{ matrix.arch }}-${{ hashFiles(''Cargo.lock'') }}'
365-
restore-keys: '22-cargo-home-${{ matrix.os }}-${{ matrix.arch }}'
364+
key: '24-cargo-home-${{ matrix.os }}-${{ matrix.arch }}-${{ hashFiles(''Cargo.lock'') }}'
365+
restore-keys: '24-cargo-home-${{ matrix.os }}-${{ matrix.arch }}'
366366
if: '!(matrix.skip)'
367367
- name: Restore cache build output (PR)
368368
uses: actions/cache/restore@v4
@@ -375,7 +375,7 @@ jobs:
375375
!./target/*/*.zip
376376
!./target/*/*.tar.gz
377377
key: never_saved
378-
restore-keys: '22-cargo-target-${{ matrix.os }}-${{ matrix.arch }}-${{ matrix.profile }}-${{ matrix.job }}-'
378+
restore-keys: '24-cargo-target-${{ matrix.os }}-${{ matrix.arch }}-${{ matrix.profile }}-${{ matrix.job }}-'
379379
- name: Apply and update mtime cache
380380
if: '!(matrix.skip) && (!startsWith(github.ref, ''refs/tags/''))'
381381
uses: ./.github/mtime_cache
@@ -685,10 +685,10 @@ jobs:
685685
!./target/*/*.zip
686686
!./target/*/*.sha256sum
687687
!./target/*/*.tar.gz
688-
key: '22-cargo-target-${{ matrix.os }}-${{ matrix.arch }}-${{ matrix.profile }}-${{ matrix.job }}-${{ github.sha }}'
688+
key: '24-cargo-target-${{ matrix.os }}-${{ matrix.arch }}-${{ matrix.profile }}-${{ matrix.job }}-${{ github.sha }}'
689689
publish-canary:
690690
name: publish canary
691-
runs-on: ubuntu-22.04
691+
runs-on: ubuntu-24.04
692692
needs:
693693
- build
694694
if: github.repository == 'denoland/deno' && github.ref == 'refs/heads/main'

.github/workflows/post_publish.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ on:
77
jobs:
88
update-dl-version:
99
name: update dl.deno.land version
10-
runs-on: ubuntu-22.04
10+
runs-on: ubuntu-24.04
1111
if: github.repository == 'denoland/deno'
1212
steps:
1313
- name: Authenticate with Google Cloud

.github/workflows/start_release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ on:
1616
jobs:
1717
build:
1818
name: start release
19-
runs-on: ubuntu-22.04
19+
runs-on: ubuntu-24.04
2020
timeout-minutes: 30
2121

2222
env:

.github/workflows/version_bump.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ on:
1616
jobs:
1717
build:
1818
name: version bump
19-
runs-on: ubuntu-22.04
19+
runs-on: ubuntu-24.04
2020
timeout-minutes: 90
2121

2222
env:

.github/workflows/wpt_epoch.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
fail-fast: false
2121
matrix:
2222
deno-version: [v1.x, canary]
23-
os: [ubuntu-22.04-xl]
23+
os: [ubuntu-24.04-xl]
2424

2525
steps:
2626
- name: Clone repository

0 commit comments

Comments
 (0)