Skip to content

Commit 95d2f3c

Browse files
mertcanaltinmertcanaltin
authored
Merge branch 'main' into mert/create-logger-api/node-core
2 parents 1f2b586 + adeb14a commit 95d2f3c

164 files changed

Lines changed: 3263 additions & 1613 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/actions/undici-wpt-current/action.yml‎

Lines changed: 56 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,56 @@
1+
name: Run undici WPT (current)
2+
description: Runs undici WPT tests for undici >= 7 and merges results into the Node.js WPT report
3+
4+
inputs:
5+
undici-version:
6+
required: true
7+
description: undici version tag to checkout
8+
wpt-report:
9+
required: true
10+
description: Path to the Node.js WPT report to merge into
11+
12+
runs:
13+
using: composite
14+
steps:
15+
- name: Checkout undici
16+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
17+
with:
18+
repository: nodejs/undici
19+
persist-credentials: false
20+
path: undici
21+
clean: false
22+
ref: ${{ inputs.undici-version }}
23+
- name: Prepare WPT checkout
24+
shell: bash
25+
run: |
26+
rm -rf undici/test/web-platform-tests/wpt
27+
mv test/fixtures/wpt undici/test/web-platform-tests/wpt
28+
- name: Configure hosts
29+
shell: bash
30+
working-directory: undici/test/web-platform-tests/wpt
31+
run: python3 wpt make-hosts-file | sudo tee -a /etc/hosts
32+
- name: Install dependencies
33+
shell: bash
34+
working-directory: undici
35+
run: npm install
36+
- name: Run WPT
37+
shell: bash
38+
working-directory: undici
39+
env:
40+
CI: 'true'
41+
WPT_REPORT: ${{ github.workspace }}/undici/wptreport.json
42+
run: npm run test:wpt || true
43+
- name: Merge report
44+
shell: bash
45+
env:
46+
NODE_WPT_REPORT: ${{ inputs.wpt-report }}
47+
UNDICI_WPT_REPORT: ${{ github.workspace }}/undici/wptreport.json
48+
run: |
49+
if [ -f "$UNDICI_WPT_REPORT" ]; then
50+
jq -sc '
51+
.[0].results += .[1].results |
52+
.[0].time_end = .[1].time_end |
53+
.[0]
54+
' "$NODE_WPT_REPORT" "$UNDICI_WPT_REPORT" > "${NODE_WPT_REPORT}.tmp"
55+
mv "${NODE_WPT_REPORT}.tmp" "$NODE_WPT_REPORT"
56+
fi

‎.github/actions/undici-wpt-legacy/action.yml‎

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
name: Run undici WPT (legacy)
2+
description: Runs undici WPT tests for undici < 7 and appends results to the Node.js WPT report
3+
4+
inputs:
5+
undici-version:
6+
required: true
7+
description: undici version tag to checkout
8+
wpt-report:
9+
required: true
10+
description: Path to the Node.js WPT report
11+
12+
runs:
13+
using: composite
14+
steps:
15+
- name: Checkout undici
16+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
17+
with:
18+
repository: nodejs/undici
19+
persist-credentials: false
20+
path: undici
21+
clean: false
22+
ref: ${{ inputs.undici-version }}
23+
- name: Prepare WPT checkout
24+
shell: bash
25+
run: |
26+
rm -rf undici/test/wpt/tests
27+
mv test/fixtures/wpt undici/test/wpt/tests
28+
- name: Install dependencies
29+
shell: bash
30+
working-directory: undici
31+
run: npm install
32+
- name: Run WPT
33+
shell: bash
34+
working-directory: undici
35+
env:
36+
WPT_REPORT: ${{ inputs.wpt-report }}
37+
run: npm run test:wpt || true

‎.github/workflows/close-stale-feature-requests.yml‎

Lines changed: 0 additions & 56 deletions
This file was deleted.

‎.github/workflows/close-stale-pull-requests.yml‎

Lines changed: 0 additions & 59 deletions
This file was deleted.

‎.github/workflows/daily-wpt-fyi.yml‎

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,48 @@ jobs:
9696
echo "WPT_REPORT=$(pwd)/out/wpt/wptreport.json" >> $GITHUB_ENV
9797
fi
9898
99+
# undici WPT Runner
100+
- name: Set env.UNDICI_VERSION
101+
if: ${{ env.WPT_REPORT != '' }}
102+
run: |
103+
UNDICI_VERSION=$(jq -r '.version' < deps/undici/src/package.json)
104+
echo "UNDICI_VERSION=v$UNDICI_VERSION" >> $GITHUB_ENV
105+
if [ "${UNDICI_VERSION%%.*}" -ge 7 ]; then
106+
echo "UNDICI_WPT=current" >> $GITHUB_ENV
107+
else
108+
echo "UNDICI_WPT=legacy" >> $GITHUB_ENV
109+
fi
110+
# Checkout composite actions from the default branch since the
111+
# version-specific checkout above overwrites .github/actions/
112+
- name: Checkout undici WPT actions
113+
if: ${{ env.WPT_REPORT != '' }}
114+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
115+
with:
116+
sparse-checkout: |
117+
.github/actions/undici-wpt-current
118+
.github/actions/undici-wpt-legacy
119+
sparse-checkout-cone-mode: false
120+
persist-credentials: false
121+
path: _wpt_actions
122+
clean: false
123+
- name: Place undici WPT actions
124+
if: ${{ env.WPT_REPORT != '' }}
125+
run: |
126+
mkdir -p .github/actions
127+
cp -r _wpt_actions/.github/actions/undici-wpt-* .github/actions/
128+
- name: Run undici WPT (current)
129+
if: ${{ env.UNDICI_WPT == 'current' }}
130+
uses: ./.github/actions/undici-wpt-current
131+
with:
132+
undici-version: ${{ env.UNDICI_VERSION }}
133+
wpt-report: ${{ env.WPT_REPORT }}
134+
- name: Run undici WPT (legacy)
135+
if: ${{ env.UNDICI_WPT == 'legacy' }}
136+
uses: ./.github/actions/undici-wpt-legacy
137+
with:
138+
undici-version: ${{ env.UNDICI_VERSION }}
139+
wpt-report: ${{ env.WPT_REPORT }}
140+
99141
# Upload artifacts
100142
- name: Clone report for upload
101143
if: ${{ env.WPT_REPORT != '' }}

‎.github/workflows/post-release.yml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,10 @@ jobs:
2020
steps:
2121
- name: Trigger update-links workflow on nodejs/release-cloudflare-worker
2222
run: |
23-
gh workflow run update-links.yml --repo nodejs/release-cloudflare-worker
23+
gh workflow run update-links.yml --repo nodejs/release-cloudflare-worker -f version=$VERSION
2424
env:
2525
GITHUB_TOKEN: ${{ secrets.GH_USER_TOKEN }}
26+
VERSION: ${{ inputs.version || github.event.release.tag_name }}
2627

2728
- name: Trigger create-release-post workflow on nodejs/nodejs.org
2829
run: |

‎.github/workflows/stale.yml‎

Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
name: Close stale
2+
on:
3+
workflow_dispatch:
4+
schedule:
5+
# Run every day at 1:00 AM UTC.
6+
- cron: 0 1 * * *
7+
8+
# yamllint disable rule:empty-lines
9+
env:
10+
CLOSE_MESSAGE: >
11+
This {0} has been automatically closed after 30 days of inactivity
12+
following its stale status (no activity for a total of 240 days).
13+
14+
If this is still relevant, feel free to reopen it or leave a comment
15+
with additional details so we can continue the discussion.
16+
17+
WARN_MESSAGE: >
18+
This {0} has been marked as stale due to 210 days of inactivity.
19+
20+
It will be automatically closed in 30 days if no further activity occurs.
21+
If this is still relevant, please leave a comment or update it to keep it open.
22+
# yamllint enable
23+
24+
permissions:
25+
contents: read
26+
27+
jobs:
28+
stale:
29+
permissions:
30+
issues: write # for actions/stale to close stale issues
31+
pull-requests: write # for actions/stale to close stale PRs
32+
if: github.repository == 'nodejs/node'
33+
runs-on: ubuntu-slim
34+
steps:
35+
- uses: actions/stale@b5d41d4e1d5dceea10e7104786b73624c18a190f # v10.2.0
36+
with:
37+
repo-token: ${{ secrets.GITHUB_TOKEN }}
38+
days-before-stale: 210
39+
days-before-close: 30
40+
stale-issue-label: stale
41+
exempt-issue-labels: never-stale, confirmed-bug
42+
close-issue-message: ${{ format(env.CLOSE_MESSAGE, 'issue') }}
43+
stale-issue-message: ${{ format(env.WARN_MESSAGE, 'issue') }}
44+
stale-pr-label: stale
45+
exempt-pr-labels: never-stale
46+
close-pr-message: ${{ format(env.CLOSE_MESSAGE, 'pull request') }}
47+
stale-pr-message: ${{ format(env.WARN_MESSAGE, 'pull request') }}
48+
# max requests it will send per run to the GitHub API before it deliberately exits to avoid hitting API rate limits
49+
operations-per-run: 500
50+
remove-stale-when-updated: true

‎CHANGELOG.md‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,8 @@ release.
5757
<a href="doc/changelogs/CHANGELOG_V25.md#25.0.0">25.0.0</a><br/>
5858
</td>
5959
<td valign="top">
60-
<b><a href="doc/changelogs/CHANGELOG_V24.md#24.14.1">24.14.1</a></b><br/>
60+
<b><a href="doc/changelogs/CHANGELOG_V24.md#24.15.0">24.15.0</a></b><br/>
61+
<a href="doc/changelogs/CHANGELOG_V24.md#24.14.1">24.14.1</a><br/>
6162
<a href="doc/changelogs/CHANGELOG_V24.md#24.14.0">24.14.0</a><br/>
6263
<a href="doc/changelogs/CHANGELOG_V24.md#24.13.1">24.13.1</a><br/>
6364
<a href="doc/changelogs/CHANGELOG_V24.md#24.13.0">24.13.0</a><br/>

‎benchmark/util/type-check.js‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,11 @@ const args = {
2323
'false-primitive': true,
2424
'false-object': int32Array,
2525
},
26+
DataView: {
27+
'true': dataView,
28+
'false-primitive': true,
29+
'false-object': uint8Array,
30+
},
2631
};
2732

2833
const bench = common.createBenchmark(main, {

‎common.gypi‎

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838

3939
# Reset this number to 0 on major V8 upgrades.
4040
# Increment by one for each non-official patch applied to deps/v8.
41-
'v8_embedder_string': '-node.17',
41+
'v8_embedder_string': '-node.18',
4242

4343
##### V8 defaults for Node.js #####
4444

@@ -591,6 +591,18 @@
591591
'-maix64',
592592
],
593593
'conditions': [
594+
[ 'clang==1', {
595+
'cflags': [
596+
'-fno-integrated-as',
597+
'-fno-xl-pragma-pack',
598+
'-mcpu=power9',
599+
],
600+
'cflags_cc': [
601+
'-fno-integrated-as',
602+
'-fno-xl-pragma-pack',
603+
'-mcpu=power9',
604+
],
605+
}],
594606
[ '"<(aix_variant_name)"=="OS400"', { # a.k.a. `IBM i`
595607
'ldflags': [
596608
'-Wl,-blibpath:/QOpenSys/pkgs/lib:/QOpenSys/usr/lib',

0 commit comments

Comments
 (0)