Skip to content

Commit 5d7ab3e

Browse files
Merge pull request #1047 from nodejs/main
Create a new pull request by comparing changes across two branches. If you
2 parents 2bab9f2 + 4e1f39b commit 5d7ab3e

File tree

428 files changed

+21445
-16995
lines changed

Some content is hidden

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

428 files changed

+21445
-16995
lines changed

.github/workflows/build-tarball.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,4 +138,4 @@ jobs:
138138
- name: Build
139139
run: make -C "$TAR_DIR" build-ci -j4 V=1
140140
- name: Test
141-
run: make -C "$TAR_DIR" run-ci -j4 V=1 TEST_CI_ARGS="-p dots --measure-flakiness 9"
141+
run: make -C "$TAR_DIR" test-ci -j1 V=1 TEST_CI_ARGS="-p dots --measure-flakiness 9"

.github/workflows/notify-on-push.yml

Lines changed: 5 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -27,36 +27,20 @@ jobs:
2727
SLACK_USERNAME: nodejs-bot
2828
SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }}
2929

30-
notifyOnMissingMetadata:
31-
name: Notify on Push on `main` that lacks metadata
30+
validateCommitMessage:
31+
name: Notify on Push on `main` with invalid message
3232
if: github.repository == 'nodejs/node'
3333
runs-on: ubuntu-latest
34-
permissions:
35-
contents: read
36-
pull-requests: write
3734
steps:
3835
- uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
3936
with:
4037
persist-credentials: false
4138
- name: Check commit message
42-
run: npx -q core-validate-commit ${{ github.event.after }} || echo "INVALID_COMMIT_MESSAGE=1" >> $GITHUB_ENV
43-
- name: Retrieve PR number if possible
44-
if: env.INVALID_COMMIT_MESSAGE
45-
run: |
46-
COMMIT_TITLE=$(git --no-pager log --oneline -1 --no-color) node <<'EOF' >> $GITHUB_ENV || true
47-
const invalidCommitMessageMatch = /\s\(\#(\d+)\)$/.exec(process.env.COMMIT_TITLE);
48-
if (invalidCommitMessageMatch == null) process.exit(1)
49-
console.log(`PR_ID=${invalidCommitMessageMatch[1]}`)
50-
EOF
51-
- name: Comment on the Pull Request
52-
if: ${{ env.PR_ID }}
53-
run: |
54-
gh pr comment ${{ env.PR_ID }} --repo "${{ github.repository }}" \
55-
--body "A commit referencing this Pull Request was pushed to `${{ github.ref_name }}` by @${{ github.actor }} with an invalid commit message."
39+
run: npx -q core-validate-commit "$COMMIT"
5640
env:
57-
GH_TOKEN: ${{ github.token }}
41+
COMMIT: ${{ github.event.after }}
5842
- name: Slack Notification
59-
if: ${{ env.INVALID_COMMIT_MESSAGE }}
43+
if: failure()
6044
uses: rtCamp/action-slack-notify@e31e87e03dd19038e411e38ae27cbad084a90661 # 2.3.3
6145
env:
6246
SLACK_COLOR: '#DE512A'

.github/workflows/test-linux.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ jobs:
7777
- name: Build
7878
run: make -C node build-ci -j4 V=1 CONFIG_FLAGS="--error-on-warn --v8-enable-temporal-support"
7979
- name: Test
80-
run: make -C node run-ci -j4 V=1 TEST_CI_ARGS="-p actions --measure-flakiness 9"
80+
run: make -C node test-ci -j1 V=1 TEST_CI_ARGS="-p actions --measure-flakiness 9"
8181
- name: Re-run test in a folder whose name contains unusual chars
8282
run: |
8383
mv node "$DIR"

.github/workflows/test-macos.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ jobs:
127127
- name: Free Space After Build
128128
run: df -h
129129
- name: Test
130-
run: make -C node run-ci -j$(getconf _NPROCESSORS_ONLN) V=1 TEST_CI_ARGS="-p actions --measure-flakiness 9"
130+
run: make -C node test-ci -j1 V=1 TEST_CI_ARGS="-p actions --measure-flakiness 9"
131131
- name: Re-run test in a folder whose name contains unusual chars
132132
run: |
133133
mv node "$DIR"

.github/workflows/test-shared.yml

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

BUILDING.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -112,15 +112,15 @@ platforms. This is true regardless of entries in the table below.
112112
| GNU/Linux | arm64 | kernel >= 4.18[^1], glibc >= 2.28 | Tier 1 | e.g. Ubuntu 20.04, Debian 10, RHEL 8 |
113113
| GNU/Linux | armv7 | kernel >= 4.18[^1], glibc >= 2.28 | Experimental | Downgraded as of Node.js 24 |
114114
| GNU/Linux | armv6 | kernel >= 4.14, glibc >= 2.24 | Experimental | Downgraded as of Node.js 12 |
115-
| GNU/Linux | ppc64le >=power8 | kernel >= 4.18[^1], glibc >= 2.28 | Tier 2 | e.g. Ubuntu 20.04, RHEL 8 |
116-
| GNU/Linux | s390x | kernel >= 4.18[^1], glibc >= 2.28 | Tier 2 | e.g. RHEL 8 |
115+
| GNU/Linux | ppc64le >=power9 | kernel >= 4.18[^1], glibc >= 2.28 | Tier 2 | e.g. Ubuntu 20.04, RHEL 8 |
116+
| GNU/Linux | s390x >=z14 | kernel >= 4.18[^1], glibc >= 2.28 | Tier 2 | e.g. RHEL 8 |
117117
| GNU/Linux | loong64 | kernel >= 5.19, glibc >= 2.36 | Experimental | |
118118
| Windows | x64 | >= Windows 10/Server 2016 | Tier 1 | [^2],[^3] |
119119
| Windows | arm64 | >= Windows 10 | Tier 2 | |
120120
| macOS | x64 | >= 13.5 | Tier 1 | For notes about compilation see [^4] |
121121
| macOS | arm64 | >= 13.5 | Tier 1 | |
122122
| SmartOS | x64 | >= 18 | Tier 2 | |
123-
| AIX | ppc64be >=power8 | >= 7.2 TL04 | Tier 2 | |
123+
| AIX | ppc64be >=power9 | >= 7.2 TL04 | Tier 2 | |
124124
| FreeBSD | x64 | >= 13.2 | Experimental | |
125125
| OpenHarmony | arm64 | >= 5.0 | Experimental | |
126126

CHANGELOG.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,8 @@ release.
4747
<a href="doc/changelogs/CHANGELOG_V25.md#25.0.0">25.0.0</a><br/>
4848
</td>
4949
<td valign="top">
50-
<b><a href="doc/changelogs/CHANGELOG_V24.md#24.11.1">24.11.1</a></b><br/>
50+
<b><a href="doc/changelogs/CHANGELOG_V24.md#24.12.0">24.12.0</a></b><br/>
51+
<a href="doc/changelogs/CHANGELOG_V24.md#24.11.1">24.11.1</a><br/>
5152
<a href="doc/changelogs/CHANGELOG_V24.md#24.11.0">24.11.0</a><br/>
5253
<a href="doc/changelogs/CHANGELOG_V24.md#24.10.0">24.10.0</a><br/>
5354
<a href="doc/changelogs/CHANGELOG_V24.md#24.9.0">24.9.0</a><br/>

README.md

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -287,6 +287,8 @@ For information about the governance of the Node.js project, see
287287
**Yagiz Nizipli** <<[email protected]>> (he/him) - [Support me](https://github.com/sponsors/anonrig)
288288
* [atlowChemi](https://github.com/atlowChemi) -
289289
**Chemi Atlow** <<[email protected]>> (he/him)
290+
* [avivkeller](https://github.com/avivkeller) -
291+
**Aviv Keller** <<[email protected]>> (he/him) - [Support me](https://github.com/sponsors/avivkeller)
290292
* [Ayase-252](https://github.com/Ayase-252) -
291293
**Qingyu Deng** <<[email protected]>>
292294
* [bengl](https://github.com/bengl) -
@@ -337,6 +339,8 @@ For information about the governance of the Node.js project, see
337339
**Geoffrey Booth** <<[email protected]>> (he/him)
338340
* [gireeshpunathil](https://github.com/gireeshpunathil) -
339341
**Gireesh Punathil** <<[email protected]>> (he/him)
342+
* [gurgunday](https://github.com/gurgunday) -
343+
**Gürgün Dayıoğlu** <<[email protected]>> (he/him)
340344
* [guybedford](https://github.com/guybedford) -
341345
**Guy Bedford** <<[email protected]>> (he/him)
342346
* [H4ad](https://github.com/H4ad) -
@@ -379,8 +383,6 @@ For information about the governance of the Node.js project, see
379383
**Jordan Harband** <<[email protected]>>
380384
* [lpinca](https://github.com/lpinca) -
381385
**Luigi Pinca** <<[email protected]>> (he/him)
382-
* [lukekarrys](https://github.com/lukekarrys) -
383-
**Luke Karrys** <<[email protected]>> (he/him)
384386
* [Lxxyx](https://github.com/Lxxyx) -
385387
**Zijian Liu** <<[email protected]>> (he/him)
386388
* [marco-ippolito](https://github.com/marco-ippolito) -
@@ -593,6 +595,8 @@ For information about the governance of the Node.js project, see
593595
**Nitzan Uziely** <<[email protected]>>
594596
* [lucamaraschi](https://github.com/lucamaraschi) -
595597
**Luca Maraschi** <<[email protected]>> (he/him)
598+
* [lukekarrys](https://github.com/lukekarrys) -
599+
**Luke Karrys** <<[email protected]>> (he/him)
596600
* [lundibundi](https://github.com/lundibundi) -
597601
**Denys Otrishko** <<[email protected]>> (he/him)
598602
* [lxe](https://github.com/lxe) -
Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
1+
'use strict';
2+
const common = require('../common.js');
3+
const assert = require('assert');
4+
5+
const bench = common.createBenchmark(main, {
6+
n: [1e6],
7+
stackCount: [99, 101],
8+
method: ['isInsideNodeModules', 'noop'],
9+
}, {
10+
flags: ['--expose-internals', '--disable-warning=internal/test/binding'],
11+
});
12+
13+
function main({ n, stackCount, method }) {
14+
const { internalBinding } = require('internal/test/binding');
15+
const { isInsideNodeModules } = internalBinding('util');
16+
17+
const testFunction = method === 'noop' ?
18+
() => {
19+
bench.start();
20+
for (let i = 0; i < n; i++) {
21+
noop();
22+
}
23+
bench.end(n);
24+
} :
25+
() => {
26+
Error.stackTraceLimit = Infinity;
27+
const existingStackFrameCount = new Error().stack.split('\n').length - 1;
28+
assert.strictEqual(existingStackFrameCount, stackCount);
29+
30+
bench.start();
31+
for (let i = 0; i < n; i++) {
32+
isInsideNodeModules();
33+
}
34+
bench.end(n);
35+
};
36+
37+
// Excluding the message line.
38+
const existingStackFrameCount = new Error().stack.split('\n').length - 1;
39+
// Excluding the test function itself.
40+
nestCallStack(stackCount - existingStackFrameCount - 1, testFunction);
41+
}
42+
43+
function nestCallStack(depth, callback) {
44+
// nestCallStack(1) already adds a stack frame, so we stop at 1.
45+
if (depth === 1) {
46+
return callback();
47+
}
48+
return nestCallStack(depth - 1, callback);
49+
}
50+
51+
function noop() {}

deps/brotli/c/common/platform.h

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -213,6 +213,10 @@ To apply compiler hint, enclose the branching condition into macros, like this:
213213
#define BROTLI_TARGET_MIPS64
214214
#endif
215215

216+
#if defined(__ia64__) || defined(_M_IA64)
217+
#define BROTLI_TARGET_IA64
218+
#endif
219+
216220
#if defined(BROTLI_TARGET_X64) || defined(BROTLI_TARGET_ARMV8_64) || \
217221
defined(BROTLI_TARGET_POWERPC64) || defined(BROTLI_TARGET_RISCV64) || \
218222
defined(BROTLI_TARGET_LOONGARCH64) || defined(BROTLI_TARGET_MIPS64)
@@ -665,13 +669,14 @@ BROTLI_UNUSED_FUNCTION void BrotliSuppressUnusedFunctions(void) {
665669
#undef BROTLI_TEST
666670
#endif
667671

668-
#if BROTLI_GNUC_HAS_ATTRIBUTE(model, 3, 0, 3)
672+
#if !defined(BROTLI_MODEL) && BROTLI_GNUC_HAS_ATTRIBUTE(model, 3, 0, 3) && \
673+
!defined(BROTLI_TARGET_IA64) && !defined(BROTLI_TARGET_LOONGARCH64)
669674
#define BROTLI_MODEL(M) __attribute__((model(M)))
670675
#else
671676
#define BROTLI_MODEL(M) /* M */
672677
#endif
673678

674-
#if BROTLI_GNUC_HAS_ATTRIBUTE(cold, 4, 3, 0)
679+
#if !defined(BROTLI_COLD) && BROTLI_GNUC_HAS_ATTRIBUTE(cold, 4, 3, 0)
675680
#define BROTLI_COLD __attribute__((cold))
676681
#else
677682
#define BROTLI_COLD /* cold */

0 commit comments

Comments
 (0)