Skip to content

Commit 1d11f92

Browse files
committed
Merge remote-tracking branch 'upstream/main' into gh-144278
2 parents 7b91da6 + fd190d1 commit 1d11f92

279 files changed

Lines changed: 6483 additions & 3362 deletions

File tree

Some content is hidden

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

.github/actionlint.yaml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
self-hosted-runner:
2-
# Pending https://github.com/rhysd/actionlint/issues/533
3-
# and https://github.com/rhysd/actionlint/issues/571
4-
labels: ["windows-11-arm", "macos-15-intel"]
2+
# Pending https://github.com/rhysd/actionlint/pull/615
3+
labels: ["windows-2025-vs2026"]
54

65
config-variables: null
76

.github/workflows/tail-call.yml

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ jobs:
3838
# Un-comment as we add support for more platforms for tail-calling interpreters.
3939
# - i686-pc-windows-msvc/msvc
4040
- x86_64-pc-windows-msvc/msvc
41+
- free-threading-msvc
4142
# - aarch64-pc-windows-msvc/msvc
4243
- x86_64-apple-darwin/clang
4344
- aarch64-apple-darwin/clang
@@ -52,7 +53,10 @@ jobs:
5253
# runner: windows-2022
5354
- target: x86_64-pc-windows-msvc/msvc
5455
architecture: x64
55-
runner: windows-2022
56+
runner: windows-2025-vs2026
57+
- target: free-threading-msvc
58+
architecture: x64
59+
runner: windows-2025-vs2026
5660
# - target: aarch64-pc-windows-msvc/msvc
5761
# architecture: ARM64
5862
# runner: windows-2022
@@ -80,15 +84,21 @@ jobs:
8084
python-version: '3.11'
8185

8286
- name: Native Windows MSVC (release)
83-
if: runner.os == 'Windows' && matrix.architecture != 'ARM64'
87+
if: runner.os == 'Windows' && matrix.architecture != 'ARM64' && matrix.target != 'free-threading-msvc'
8488
shell: pwsh
8589
run: |
86-
choco install visualstudio2026buildtools --no-progress -y --force --params "--add Microsoft.VisualStudio.Component.VC.Tools.x86.x64 --locale en-US --passive"
87-
$env:PATH = "C:\Program Files (x86)\Microsoft Visual Studio\18\BuildTools\MSBuild\Current\bin;$env:PATH"
8890
$env:PlatformToolset = "v145"
8991
./PCbuild/build.bat --tail-call-interp -c Release -p ${{ matrix.architecture }}
9092
./PCbuild/rt.bat -p ${{ matrix.architecture }} -q --multiprocess 0 --timeout 4500 --verbose2 --verbose3
9193
94+
# No tests:
95+
- name: Native Windows MSVC with free-threading (release)
96+
if: matrix.target == 'free-threading-msvc'
97+
shell: pwsh
98+
run: |
99+
$env:PlatformToolset = "v145"
100+
./PCbuild/build.bat --tail-call-interp --disable-gil -c Release -p ${{ matrix.architecture }}
101+
92102
# No tests (yet):
93103
- name: Emulated Windows Clang (release)
94104
if: runner.os == 'Windows' && matrix.architecture == 'ARM64'

.pre-commit-config.yaml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
repos:
22
- repo: https://github.com/astral-sh/ruff-pre-commit
3-
rev: v0.14.10
3+
rev: v0.15.0
44
hooks:
55
- id: ruff-check
66
name: Run Ruff (lint) on Apple/
@@ -52,14 +52,14 @@ repos:
5252
files: ^Tools/wasm/
5353

5454
- repo: https://github.com/psf/black-pre-commit-mirror
55-
rev: 25.12.0
55+
rev: 26.1.0
5656
hooks:
5757
- id: black
5858
name: Run Black on Tools/jit/
5959
files: ^Tools/jit/
6060

6161
- repo: https://github.com/Lucas-C/pre-commit-hooks
62-
rev: v1.5.5
62+
rev: v1.5.6
6363
hooks:
6464
- id: remove-tabs
6565
types: [python]
@@ -83,19 +83,19 @@ repos:
8383
files: '^\.github/CODEOWNERS|\.(gram)$'
8484

8585
- repo: https://github.com/python-jsonschema/check-jsonschema
86-
rev: 0.36.0
86+
rev: 0.36.1
8787
hooks:
8888
- id: check-dependabot
8989
- id: check-github-workflows
9090
- id: check-readthedocs
9191

9292
- repo: https://github.com/rhysd/actionlint
93-
rev: v1.7.9
93+
rev: v1.7.10
9494
hooks:
9595
- id: actionlint
9696

9797
- repo: https://github.com/woodruffw/zizmor-pre-commit
98-
rev: v1.19.0
98+
rev: v1.22.0
9999
hooks:
100100
- id: zizmor
101101

0 commit comments

Comments
 (0)