Skip to content

Commit 3531c11

Browse files
Merge pull request #716 from denoland/main
Create a new pull request by comparing changes across two branches
2 parents 3265b19 + 1317a36 commit 3531c11

File tree

274 files changed

+6417
-1323
lines changed

Some content is hidden

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

274 files changed

+6417
-1323
lines changed

.dprint.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@
8383
"tests/specs/run/error_syntax_empty_trailing_line/error_syntax_empty_trailing_line.mjs"
8484
],
8585
"plugins": [
86-
"https://plugins.dprint.dev/typescript-0.95.11.wasm",
86+
"https://plugins.dprint.dev/typescript-0.95.13.wasm",
8787
"https://plugins.dprint.dev/json-0.21.0.wasm",
8888
"https://plugins.dprint.dev/markdown-0.20.0.wasm",
8989
"https://plugins.dprint.dev/toml-0.7.0.wasm",

.github/workflows/ci.generate.ts

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,14 @@ 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 = 80;
8+
const cacheVersion = 81;
99

1010
const ubuntuX86Runner = "ubuntu-24.04";
1111
const ubuntuX86XlRunner = "ghcr.io/cirruslabs/ubuntu-runner-amd64:24.04";
12-
const ubuntuARMRunner = "ubicloud-standard-16-arm";
12+
const ubuntuARMRunner = "ghcr.io/cirruslabs/ubuntu-runner-arm64:24.04";
1313
const windowsX86Runner = "windows-2022";
1414
const windowsX86XlRunner = "windows-2022-xl";
15-
const macosX86Runner = "macos-13";
15+
const macosX86Runner = "macos-15-intel";
1616
const macosArmRunner = "macos-14";
1717
const selfHostedMacosArmRunner = "ghcr.io/cirruslabs/macos-runner:sonoma";
1818

@@ -76,7 +76,7 @@ const prCachePath = [
7676
].join("\n");
7777

7878
// Note that you may need to add more version to the `apt-get remove` line below if you change this
79-
const llvmVersion = 20;
79+
const llvmVersion = 21;
8080
const installPkgsCommand =
8181
`sudo apt-get install -y --no-install-recommends clang-${llvmVersion} lld-${llvmVersion} clang-tools-${llvmVersion} clang-format-${llvmVersion} clang-tidy-${llvmVersion}`;
8282
const sysRootStep = {
@@ -540,6 +540,11 @@ const ci = {
540540
},
541541
cacheCargoHomeStep,
542542
installRustStep,
543+
{
544+
if: "matrix.os == 'linux' && matrix.arch == 'aarch64'",
545+
name: "Load 'vsock_loopback; kernel module",
546+
run: "sudo modprobe vsock_loopback",
547+
},
543548
{
544549
if: "matrix.job == 'test' || matrix.job == 'bench'",
545550
...installDenoStep,

.github/workflows/ci.yml

Lines changed: 25 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -60,12 +60,12 @@ jobs:
6060
include:
6161
- os: macos
6262
arch: x86_64
63-
runner: macos-13
63+
runner: macos-15-intel
6464
job: test
6565
profile: debug
6666
- os: macos
6767
arch: x86_64
68-
runner: '${{ (!contains(github.event.pull_request.labels.*.name, ''ci-full'') && (github.event_name == ''pull_request'')) && ''ubuntu-24.04'' || ''macos-13'' }}'
68+
runner: '${{ (!contains(github.event.pull_request.labels.*.name, ''ci-full'') && (github.event_name == ''pull_request'')) && ''ubuntu-24.04'' || ''macos-15-intel'' }}'
6969
job: test
7070
profile: release
7171
skip: '${{ !contains(github.event.pull_request.labels.*.name, ''ci-full'') && (github.event_name == ''pull_request'') }}'
@@ -113,12 +113,12 @@ jobs:
113113
use_sysroot: true
114114
- os: linux
115115
arch: aarch64
116-
runner: ubicloud-standard-16-arm
116+
runner: 'ghcr.io/cirruslabs/ubuntu-runner-arm64:24.04'
117117
job: test
118118
profile: debug
119119
- os: linux
120120
arch: aarch64
121-
runner: '${{ (!contains(github.event.pull_request.labels.*.name, ''ci-full'') && (github.event_name == ''pull_request'')) && ''ubuntu-24.04'' || ''ubicloud-standard-16-arm'' }}'
121+
runner: '${{ (!contains(github.event.pull_request.labels.*.name, ''ci-full'') && (github.event_name == ''pull_request'')) && ''ubuntu-24.04'' || ''ghcr.io/cirruslabs/ubuntu-runner-arm64:24.04'' }}'
122122
job: test
123123
profile: release
124124
use_sysroot: true
@@ -173,11 +173,14 @@ jobs:
173173
~/.cargo/registry/index
174174
~/.cargo/registry/cache
175175
~/.cargo/git/db
176-
key: '80-cargo-home-${{ matrix.os }}-${{ matrix.arch }}-${{ hashFiles(''Cargo.lock'') }}'
177-
restore-keys: '80-cargo-home-${{ matrix.os }}-${{ matrix.arch }}-'
176+
key: '81-cargo-home-${{ matrix.os }}-${{ matrix.arch }}-${{ hashFiles(''Cargo.lock'') }}'
177+
restore-keys: '81-cargo-home-${{ matrix.os }}-${{ matrix.arch }}-'
178178
if: '!(matrix.skip)'
179179
- uses: dsherret/rust-toolchain-file@v1
180180
if: '!(matrix.skip)'
181+
- if: '!(matrix.skip) && (matrix.os == ''linux'' && matrix.arch == ''aarch64'')'
182+
name: Load 'vsock_loopback; kernel module
183+
run: sudo modprobe vsock_loopback
181184
- if: '!(matrix.skip) && (matrix.job == ''test'' || matrix.job == ''bench'')'
182185
name: Install Deno
183186
uses: denoland/setup-deno@v2
@@ -257,18 +260,18 @@ jobs:
257260
sudo apt-get -qq remove 'clang-12*' 'clang-13*' 'clang-14*' 'clang-15*' 'clang-16*' 'clang-17*' 'clang-18*' 'clang-19*' 'llvm-12*' 'llvm-13*' 'llvm-14*' 'llvm-15*' 'llvm-16*' 'llvm-17*' 'llvm-18*' 'llvm-19*' 'lld-12*' 'lld-13*' 'lld-14*' 'lld-15*' 'lld-16*' 'lld-17*' 'lld-18*' 'lld-19*' > /dev/null 2> /dev/null
258261
259262
# Install clang-XXX, lld-XXX, and debootstrap.
260-
echo "deb http://apt.llvm.org/jammy/ llvm-toolchain-jammy-20 main" |
261-
sudo dd of=/etc/apt/sources.list.d/llvm-toolchain-jammy-20.list
263+
echo "deb http://apt.llvm.org/jammy/ llvm-toolchain-jammy-21 main" |
264+
sudo dd of=/etc/apt/sources.list.d/llvm-toolchain-jammy-21.list
262265
curl https://apt.llvm.org/llvm-snapshot.gpg.key |
263266
gpg --dearmor |
264267
sudo dd of=/etc/apt/trusted.gpg.d/llvm-snapshot.gpg
265268
sudo apt-get update
266269
# this was unreliable sometimes, so try again if it fails
267-
sudo apt-get install -y --no-install-recommends clang-20 lld-20 clang-tools-20 clang-format-20 clang-tidy-20 || echo 'Failed. Trying again.' && sudo apt-get clean && sudo apt-get update && sudo apt-get install -y --no-install-recommends clang-20 lld-20 clang-tools-20 clang-format-20 clang-tidy-20
270+
sudo apt-get install -y --no-install-recommends clang-21 lld-21 clang-tools-21 clang-format-21 clang-tidy-21 || echo 'Failed. Trying again.' && sudo apt-get clean && sudo apt-get update && sudo apt-get install -y --no-install-recommends clang-21 lld-21 clang-tools-21 clang-format-21 clang-tidy-21
268271
# Fix alternatives
269272
(yes '' | sudo update-alternatives --force --all) > /dev/null 2> /dev/null || true
270273
271-
clang-20 -c -o /tmp/memfd_create_shim.o tools/memfd_create_shim.c -fPIC
274+
clang-21 -c -o /tmp/memfd_create_shim.o tools/memfd_create_shim.c -fPIC
272275
273276
echo "Decompressing sysroot..."
274277
wget -q https://github.com/denoland/deno_sysroot_build/releases/download/sysroot-20250207/sysroot-`uname -m`.tar.xz -O /tmp/sysroot.tar.xz
@@ -301,8 +304,8 @@ jobs:
301304
CARGO_PROFILE_RELEASE_INCREMENTAL=false
302305
RUSTFLAGS<<__1
303306
-C linker-plugin-lto=true
304-
-C linker=clang-20
305-
-C link-arg=-fuse-ld=lld-20
307+
-C linker=clang-21
308+
-C link-arg=-fuse-ld=lld-21
306309
-C link-arg=-ldl
307310
-C link-arg=-Wl,--allow-shlib-undefined
308311
-C link-arg=-Wl,--thinlto-cache-dir=$(pwd)/target/release/lto-cache
@@ -313,8 +316,8 @@ jobs:
313316
__1
314317
RUSTDOCFLAGS<<__1
315318
-C linker-plugin-lto=true
316-
-C linker=clang-20
317-
-C link-arg=-fuse-ld=lld-20
319+
-C linker=clang-21
320+
-C link-arg=-fuse-ld=lld-21
318321
-C link-arg=-ldl
319322
-C link-arg=-Wl,--allow-shlib-undefined
320323
-C link-arg=-Wl,--thinlto-cache-dir=$(pwd)/target/release/lto-cache
@@ -323,7 +326,7 @@ jobs:
323326
--cfg tokio_unstable
324327
$RUSTFLAGS
325328
__1
326-
CC=/usr/bin/clang-20
329+
CC=/usr/bin/clang-21
327330
CFLAGS=$CFLAGS
328331
" > $GITHUB_ENV
329332
- name: Remove macOS cURL --ipv4 flag
@@ -376,7 +379,7 @@ jobs:
376379
!./target/*/*.zip
377380
!./target/*/*.tar.gz
378381
key: never_saved
379-
restore-keys: '80-cargo-target-${{ matrix.os }}-${{ matrix.arch }}-${{ matrix.profile }}-${{ matrix.job }}-'
382+
restore-keys: '81-cargo-target-${{ matrix.os }}-${{ matrix.arch }}-${{ matrix.profile }}-${{ matrix.job }}-'
380383
- name: Apply and update mtime cache
381384
if: '!(matrix.skip) && (!startsWith(github.ref, ''refs/tags/''))'
382385
uses: ./.github/mtime_cache
@@ -741,7 +744,7 @@ jobs:
741744
!./target/*/gn_root
742745
!./target/*/*.zip
743746
!./target/*/*.tar.gz
744-
key: '80-cargo-target-${{ matrix.os }}-${{ matrix.arch }}-${{ matrix.profile }}-${{ matrix.job }}-${{ github.sha }}'
747+
key: '81-cargo-target-${{ matrix.os }}-${{ matrix.arch }}-${{ matrix.profile }}-${{ matrix.job }}-${{ github.sha }}'
745748
lint:
746749
name: 'lint ${{ matrix.profile }} ${{ matrix.os }}-${{ matrix.arch }}'
747750
needs:
@@ -762,7 +765,7 @@ jobs:
762765
job: lint
763766
- os: macos
764767
arch: x86_64
765-
runner: macos-13
768+
runner: macos-15-intel
766769
profile: debug
767770
job: lint
768771
- os: windows
@@ -792,8 +795,8 @@ jobs:
792795
~/.cargo/registry/index
793796
~/.cargo/registry/cache
794797
~/.cargo/git/db
795-
key: '80-cargo-home-${{ matrix.os }}-${{ matrix.arch }}-${{ hashFiles(''Cargo.lock'') }}'
796-
restore-keys: '80-cargo-home-${{ matrix.os }}-${{ matrix.arch }}-'
798+
key: '81-cargo-home-${{ matrix.os }}-${{ matrix.arch }}-${{ hashFiles(''Cargo.lock'') }}'
799+
restore-keys: '81-cargo-home-${{ matrix.os }}-${{ matrix.arch }}-'
797800
- uses: dsherret/rust-toolchain-file@v1
798801
- name: Install Deno
799802
uses: denoland/setup-deno@v2
@@ -810,7 +813,7 @@ jobs:
810813
!./target/*/*.zip
811814
!./target/*/*.tar.gz
812815
key: never_saved
813-
restore-keys: '80-cargo-target-${{ matrix.os }}-${{ matrix.arch }}-${{ matrix.profile }}-${{ matrix.job }}-'
816+
restore-keys: '81-cargo-target-${{ matrix.os }}-${{ matrix.arch }}-${{ matrix.profile }}-${{ matrix.job }}-'
814817
- name: test_format.js
815818
if: matrix.os == 'linux'
816819
run: deno run --allow-write --allow-read --allow-run --allow-net ./tools/format.js --check
@@ -830,7 +833,7 @@ jobs:
830833
!./target/*/gn_root
831834
!./target/*/*.zip
832835
!./target/*/*.tar.gz
833-
key: '80-cargo-target-${{ matrix.os }}-${{ matrix.arch }}-${{ matrix.profile }}-${{ matrix.job }}-${{ github.sha }}'
836+
key: '81-cargo-target-${{ matrix.os }}-${{ matrix.arch }}-${{ matrix.profile }}-${{ matrix.job }}-${{ github.sha }}'
834837
libs:
835838
name: build libs
836839
needs:

.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,3 +45,6 @@ Untitled*.ipynb
4545
/.ms-playwright
4646

4747
**/.claude/settings.local.json
48+
49+
# pyenv
50+
/.python-version

0 commit comments

Comments
 (0)