Skip to content

Commit d7d4202

Browse files
committed
Merge branch 'main' into test-runner-worker-id
2 parents 897df8b + 5d494ef commit d7d4202

File tree

7,224 files changed

+1013696
-497416
lines changed

Some content is hidden

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

7,224 files changed

+1013696
-497416
lines changed

.configurations/configuration.dsc.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@ properties:
55
- resource: Microsoft.WinGet.DSC/WinGetPackage
66
id: pythonPackage
77
directives:
8-
description: Install Python 3.12
8+
description: Install Python 3.14
99
module: Microsoft.WinGet.DSC
1010
allowPrerelease: true
1111
settings:
12-
id: Python.Python.3.12
12+
id: Python.Python.3.14
1313
source: winget
1414
- resource: Microsoft.WinGet.DSC/WinGetPackage
1515
id: vsPackage
@@ -51,4 +51,4 @@ properties:
5151
settings:
5252
id: Nasm.Nasm
5353
source: winget
54-
configurationVersion: 0.1.0
54+
configurationVersion: 0.1.1

.configurations/configuration.vsEnterprise.dsc.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@ properties:
55
- resource: Microsoft.WinGet.DSC/WinGetPackage
66
id: pythonPackage
77
directives:
8-
description: Install Python 3.12
8+
description: Install Python 3.14
99
module: Microsoft.WinGet.DSC
1010
allowPrerelease: true
1111
settings:
12-
id: Python.Python.3.12
12+
id: Python.Python.3.14
1313
source: winget
1414
- resource: Microsoft.WinGet.DSC/WinGetPackage
1515
id: vsPackage
@@ -51,4 +51,4 @@ properties:
5151
settings:
5252
id: Nasm.Nasm
5353
source: winget
54-
configurationVersion: 0.1.0
54+
configurationVersion: 0.1.1

.configurations/configuration.vsProfessional.dsc.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@ properties:
55
- resource: Microsoft.WinGet.DSC/WinGetPackage
66
id: pythonPackage
77
directives:
8-
description: Install Python 3.12
8+
description: Install Python 3.14
99
module: Microsoft.WinGet.DSC
1010
allowPrerelease: true
1111
settings:
12-
id: Python.Python.3.12
12+
id: Python.Python.3.14
1313
source: winget
1414
- resource: Microsoft.WinGet.DSC/WinGetPackage
1515
id: vsPackage
@@ -51,4 +51,4 @@ properties:
5151
settings:
5252
id: Nasm.Nasm
5353
source: winget
54-
configurationVersion: 0.1.0
54+
configurationVersion: 0.1.1

.devcontainer/base/devcontainer.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,6 @@
77
"mounts": [
88
"source=node-devcontainer-cache,target=/home/developer/nodejs/node/out,type=volume"
99
],
10-
"postCreateCommand": "git restore-mtime"
10+
"postCreateCommand": "git restore-mtime",
11+
"postStartCommand": "cp /home/developer/envrc/static-libs.envrc /home/developer/nodejs/node/.envrc && direnv allow /home/developer/nodejs/node"
1112
}

.github/CODEOWNERS

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@
2929

3030
# streams
3131

32-
/lib/_stream* @nodejs/streams
3332
/lib/internal/streams/* @nodejs/streams
3433
/lib/stream.js @nodejs/streams
3534
/lib/stream/* @nodejs/streams
@@ -153,13 +152,15 @@
153152
/test/parallel/test-runner-* @nodejs/test_runner
154153

155154
# Single Executable Applications
155+
/deps/LIEF @nodejs/single-executable
156156
/deps/postject @nodejs/single-executable
157157
/doc/api/single-executable-applications.md @nodejs/single-executable
158158
/doc/contributing/maintaining/maintaining-single-executable-application-support.md @nodejs/single-executable
159159
/src/node_sea* @nodejs/single-executable
160160
/test/fixtures/postject-copy @nodejs/single-executable
161161
/test/sea @nodejs/single-executable
162162
/tools/dep_updaters/update-postject.sh @nodejs/single-executable
163+
/tools/dep_updaters/update-lief.sh @nodejs/single-executable
163164

164165
# Permission Model
165166
/doc/api/permissions.md @nodejs/security-wg

.github/ISSUE_TEMPLATE/config.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ contact_links:
55
about: Please file an issue in our help repo.
66
- name: 📦 Have an issue with npm?
77
url: https://github.com/npm/cli/issues
8-
about: npm has a seperate issue tracker.
8+
about: npm has a separate issue tracker.
99
- name: 📡 Have an issue with undici? (`WebSocket`, `fetch`, etc.)
1010
url: https://github.com/nodejs/undici/issues
11-
about: Undici has a seperate issue tracker.
11+
about: Undici has a separate issue tracker.
1212
- name: 🌐 Found a problem with nodejs.org beyond the API reference docs?
1313
url: https://github.com/nodejs/nodejs.org/issues/new/choose
1414
about: Please file an issue in the Node.js website repo.

.github/label-pr-config.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ subSystemLabels:
8080
/^deps\/v8\/tools\/gen-postmortem-metadata\.py/: v8 engine, python, post-mortem
8181
/^deps\/v8\//: v8 engine
8282
/^deps\/uvwasi\//: wasi
83-
/^deps\/npm\//: npm, fast-track
83+
/^deps\/npm\//: npm
8484
/^deps\/nghttp2\/nghttp2\.gyp/: build, http2
8585
/^deps\/nghttp2\//: http2
8686
/^deps\/ngtcp2\//: quic

.github/workflows/lint-release-proposal.yml

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ jobs:
2626
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
2727
with:
2828
persist-credentials: false
29+
fetch-depth: 2
2930
- name: Lint release commit title format
3031
run: |
3132
EXPECTED_TITLE='^[[:digit:]]{4}-[[:digit:]]{2}-[[:digit:]]{2}, Version [[:digit:]]+\.[[:digit:]]+\.[[:digit:]]+ (\(Current|'.+' \(LTS)\)$'
@@ -51,6 +52,29 @@ jobs:
5152
- name: Verify it's release-ready
5253
run: |
5354
SKIP_XZ=1 make release-only
55+
- name: Lint release commit content
56+
run: |
57+
MAJOR="$(awk '/^#define NODE_MAJOR_VERSION / { print $3 }' src/node_version.h)"
58+
59+
echo "Checking for expected files in the release commit:"
60+
missing_expected=
61+
for expected in CHANGELOG.md src/node_version.h doc/changelogs/; do
62+
if git diff --exit-code --quiet --diff-filter=M HEAD^ -- "$expected"; then
63+
echo "Missing expected file in diff: $expected"
64+
missing_expected=1
65+
fi
66+
done
67+
[ -z "$missing_expected" ] || exit 1
68+
69+
echo "Checking for unexpected files in the release commit:"
70+
set -ex
71+
[ -z "$(git diff-tree --no-commit-id --name-only -r HEAD --\
72+
. \
73+
':(exclude)CHANGELOG.md' \
74+
':(exclude)src/node_version.h' \
75+
':(exclude)test/parallel/test-process-release.js' \
76+
':(exclude)doc/api/' \
77+
":(exclude)doc/changelogs/CHANGELOG_V$MAJOR.md")" ]
5478
- name: Validate CHANGELOG
5579
id: releaser-info
5680
run: |

.github/workflows/linters.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ jobs:
153153
- name: Lint Nix files
154154
run: |
155155
nix-shell -I nixpkgs=./tools/nix/pkgs.nix -p 'nixfmt-tree' --run '
156-
treefmt --quiet --fail-on-change
156+
treefmt --quiet --ci
157157
' || git --no-pager diff --exit-code
158158
159159
lint-py:

.github/workflows/test-shared.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -198,7 +198,7 @@ jobs:
198198
--arg ccache '(import <nixpkgs> {}).sccache' \
199199
--arg devTools '[]' \
200200
--arg benchmarkTools '[]' \
201-
${{ endsWith(matrix.system, '-darwin') && '--arg withAmaro false --arg withSQLite false --arg extraConfigFlags ''["--without-inspector" "--without-node-options"]'' \' || '\' }}
201+
${{ endsWith(matrix.system, '-darwin') && '--arg withAmaro false --arg withLief false --arg withSQLite false --arg extraConfigFlags ''["--without-inspector" "--without-node-options"]'' \' || '\' }}
202202
--run '
203203
make -C "$TAR_DIR" run-ci -j4 V=1 TEST_CI_ARGS="-p actions --measure-flakiness 9 --skip-tests=$CI_SKIP_TESTS"
204204
'

0 commit comments

Comments
 (0)