Skip to content

Commit bf4b7cf

Browse files
authored
Merge branch 'main' into v8_add_cpu_profile_api
2 parents ff0cced + 24ded11 commit bf4b7cf

File tree

644 files changed

+15418
-8025
lines changed

Some content is hidden

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

644 files changed

+15418
-8025
lines changed

.github/workflows/build-tarball.yml

Lines changed: 7 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -52,16 +52,14 @@ jobs:
5252
- name: Make tarball
5353
run: |
5454
export DISTTYPE=nightly
55-
export DATESTRING=`date "+%Y-%m-%d"`
55+
export DATESTRING=$(date "+%Y-%m-%d")
5656
export COMMIT=$(git rev-parse --short=10 "$GITHUB_SHA")
57-
./configure && make tar -j8 SKIP_XZ=1
58-
mkdir tarballs
59-
mv *.tar.gz tarballs
57+
./configure && make tar -j4 SKIP_XZ=1
6058
- name: Upload tarball artifact
6159
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
6260
with:
6361
name: tarballs
64-
path: tarballs
62+
path: '*.tar.gz'
6563
compression-level: 0
6664
test-tarball-linux:
6765
needs: build-tarball
@@ -97,21 +95,9 @@ jobs:
9795
path: tarballs
9896
- name: Extract tarball
9997
run: |
100-
tar xzf tarballs/*.tar.gz -C $RUNNER_TEMP
101-
echo "TAR_DIR=$RUNNER_TEMP/`basename tarballs/*.tar.gz .tar.gz`" >> $GITHUB_ENV
98+
tar xzf tarballs/*.tar.gz -C "$RUNNER_TEMP"
99+
echo "TAR_DIR=$RUNNER_TEMP/$(basename tarballs/*.tar.gz .tar.gz)" >> "$GITHUB_ENV"
102100
- name: Build
103-
run: |
104-
make -C "$TAR_DIR" build-ci -j4 V=1
105-
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
106-
with:
107-
persist-credentials: false
108-
sparse-checkout: |
109-
tools/eslint
110-
tools/eslint-rules
111-
- name: Move directories needed for testing
112-
run: |
113-
mv tools/eslint "$TAR_DIR/tools"
114-
mv tools/eslint-rules "$TAR_DIR/tools"
101+
run: make -C "$TAR_DIR" build-ci -j4 V=1
115102
- name: Test
116-
run: |
117-
make -C "$TAR_DIR" run-ci -j4 V=1 TEST_CI_ARGS="-p dots --measure-flakiness 9"
103+
run: make -C "$TAR_DIR" run-ci -j4 V=1 TEST_CI_ARGS="-p dots --measure-flakiness 9"

.github/workflows/test-internet.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ permissions:
4343

4444
jobs:
4545
test-internet:
46-
if: github.repository == 'nodejs/node' || github.event_name != 'schedule'
46+
if: github.event_name == 'schedule' && github.repository == 'nodejs/node' || github.event.pull_request.draft == false
4747
runs-on: ubuntu-24.04
4848
steps:
4949
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
!.nycrc
2222
!.yamllint.yaml
2323
!.configurations/
24+
!/.npmrc
2425

2526
# === Rules for root dir ===
2627
/core

.npmrc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
ignore-scripts=true

CHANGELOG.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,8 @@ release.
3939
</tr>
4040
<tr>
4141
<td valign="top">
42-
<b><a href="doc/changelogs/CHANGELOG_V24.md#24.7.0">24.7.0</a></b><br/>
42+
<b><a href="doc/changelogs/CHANGELOG_V24.md#24.8.0">24.8.0</a></b><br/>
43+
<a href="doc/changelogs/CHANGELOG_V24.md#24.7.0">24.7.0</a><br/>
4344
<a href="doc/changelogs/CHANGELOG_V24.md#24.6.0">24.6.0</a><br/>
4445
<a href="doc/changelogs/CHANGELOG_V24.md#24.5.0">24.5.0</a><br/>
4546
<a href="doc/changelogs/CHANGELOG_V24.md#24.4.1">24.4.1</a><br/>

Makefile

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1213,6 +1213,8 @@ $(TARBALL): release-only doc-only
12131213
$(RM) -r $(TARNAME)/.editorconfig
12141214
$(RM) -r $(TARNAME)/.git*
12151215
$(RM) -r $(TARNAME)/.mailmap
1216+
$(RM) -r $(TARNAME)/deps/corepack
1217+
$(RM) $(TARNAME)/test/parallel/test-corepack-version.js
12161218
$(RM) -r $(TARNAME)/deps/openssl/openssl/demos
12171219
$(RM) -r $(TARNAME)/deps/openssl/openssl/doc
12181220
$(RM) -r $(TARNAME)/deps/openssl/openssl/test
@@ -1227,6 +1229,7 @@ $(TARBALL): release-only doc-only
12271229
$(RM) -r $(TARNAME)/tools/cpplint.py
12281230
$(RM) -r $(TARNAME)/tools/eslint
12291231
$(RM) -r $(TARNAME)/tools/eslint-rules
1232+
$(RM) -r $(TARNAME)/test/parallel/test-eslint-*
12301233
$(RM) -r $(TARNAME)/tools/license-builder.sh
12311234
$(RM) -r $(TARNAME)/tools/eslint/node_modules
12321235
$(RM) -r $(TARNAME)/tools/osx-*

SECURITY.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,13 @@ you informed of the progress being made towards a fix and full announcement,
1515
and may ask for additional information or guidance surrounding the reported
1616
issue.
1717

18+
If you do not receive an acknowledgement of your report within 6 business
19+
days, or if you cannot find a private security contact for the project, you
20+
may escalate to the OpenJS Foundation CNA at `security@lists.openjsf.org`.
21+
22+
If the project acknowledges your report but does not provide any further
23+
response or engagement within 14 days, escalation is also appropriate.
24+
1825
### Node.js bug bounty program
1926

2027
The Node.js project engages in an official bug bounty program for security

benchmark/cluster/echo.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ if (cluster.isPrimary) {
88
payload: ['string', 'object'],
99
sendsPerBroadcast: [1, 10],
1010
serialization: ['json', 'advanced'],
11-
n: [1e5],
11+
n: [1e3],
1212
});
1313

1414
function main({

benchmark/dgram/multi-buffer.js

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,18 +5,18 @@ const common = require('../common.js');
55
const dgram = require('dgram');
66
const PORT = common.PORT;
77

8-
// `num` is the number of send requests to queue up each time.
8+
// `n` is the number of send requests to queue up each time.
99
// Keep it reasonably high (>10) otherwise you're benchmarking the speed of
1010
// event loop cycles more than anything else.
1111
const bench = common.createBenchmark(main, {
12-
len: [64, 256, 1024],
13-
num: [100],
14-
chunks: [1, 2, 4, 8],
12+
len: [64, 512, 1024],
13+
n: [100],
14+
chunks: [1, 8],
1515
type: ['send', 'recv'],
1616
dur: [5],
1717
});
1818

19-
function main({ dur, len, num, type, chunks }) {
19+
function main({ dur, len, n, type, chunks }) {
2020
const chunk = [];
2121
for (let i = 0; i < chunks; i++) {
2222
chunk.push(Buffer.allocUnsafe(Math.round(len / chunks)));
@@ -26,11 +26,11 @@ function main({ dur, len, num, type, chunks }) {
2626
const socket = dgram.createSocket('udp4');
2727

2828
function onsend() {
29-
if (sent++ % num === 0) {
29+
if (sent++ % n === 0) {
3030
// The setImmediate() is necessary to have event loop progress on OSes
3131
// that only perform synchronous I/O on nonblocking UDP sockets.
3232
setImmediate(() => {
33-
for (let i = 0; i < num; i++) {
33+
for (let i = 0; i < n; i++) {
3434
socket.send(chunk, PORT, '127.0.0.1', onsend);
3535
}
3636
});

benchmark/dgram/send-types.js

Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
1+
'use strict';
2+
3+
const common = require('../common.js');
4+
const dgram = require('dgram');
5+
const { Buffer } = require('buffer');
6+
7+
const bench = common.createBenchmark(main, {
8+
type: ['string', 'buffer', 'mixed', 'typedarray'],
9+
chunks: [1, 4, 8, 16],
10+
len: [64, 512, 1024],
11+
n: [1000],
12+
});
13+
14+
function main({ type, chunks, len, n }) {
15+
const socket = dgram.createSocket('udp4');
16+
17+
let testData;
18+
switch (type) {
19+
case 'string':
20+
testData = Array(chunks).fill('a'.repeat(len));
21+
break;
22+
case 'buffer':
23+
testData = Array(chunks).fill(Buffer.alloc(len, 'a'));
24+
break;
25+
case 'mixed':
26+
testData = [];
27+
for (let i = 0; i < chunks; i++) {
28+
if (i % 2 === 0) {
29+
testData.push(Buffer.alloc(len, 'a'));
30+
} else {
31+
testData.push('a'.repeat(len));
32+
}
33+
}
34+
break;
35+
case 'typedarray':
36+
testData = Array(chunks).fill(new Uint8Array(len).fill(97));
37+
break;
38+
}
39+
40+
bench.start();
41+
42+
for (let i = 0; i < n; i++) {
43+
socket.send(testData, 12345, 'localhost', (err) => {
44+
if (err && err.code !== 'ENOTCONN' && err.code !== 'ECONNREFUSED') {
45+
throw err;
46+
}
47+
});
48+
}
49+
50+
bench.end(n);
51+
socket.close();
52+
}

0 commit comments

Comments
 (0)