Skip to content

Commit 1b31e8d

Browse files
authored
Merge branch 'main' into mert/create-logger-api/node-core
2 parents 7e478d9 + adac077 commit 1b31e8d

1,335 files changed

Lines changed: 55405 additions & 17352 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/workflows/build-tarball.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ jobs:
9191
export COMMIT=$(git rev-parse --short=10 "$GITHUB_SHA")
9292
./configure && make tar -j4 SKIP_XZ=1
9393
- name: Upload tarball artifact
94-
uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
94+
uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
9595
with:
9696
name: tarballs
9797
path: '*.tar.gz'
@@ -127,7 +127,7 @@ jobs:
127127
- name: Environment Information
128128
run: npx envinfo
129129
- name: Download tarball
130-
uses: actions/download-artifact@37930b1c2abaa49bbe596cd826c3c89aef350131 # v7.0.0
130+
uses: actions/download-artifact@70fc10c6e5e1ce46ad2ea6f2b72d43f7d47b13c3 # v8.0.0
131131
with:
132132
name: tarballs
133133
path: tarballs

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ jobs:
4949
# install a version and checkout
5050
- name: Get latest nightly
5151
if: matrix.node-version == 'latest-nightly'
52-
run: echo "NIGHTLY=$(curl -s https://nodejs.org/download/nightly/index.json | jq -r '[.[] | select(.files[] | contains("linux-x64"))][0].version')" >> $GITHUB_ENV
52+
run: echo "NIGHTLY=$(curl -s https://nodejs.org/download/nightly/index.json | jq -r '[.[] | select(.files[] | contains("linux-arm64"))][0].version')" >> $GITHUB_ENV
5353
- name: Install Node.js
5454
id: setup-node
5555
uses: actions/setup-node@6044e13b5dc448c55e2357c09f80417699197238 # v6.2.0
@@ -103,7 +103,7 @@ jobs:
103103
run: cp wptreport.json wptreport-${{ steps.setup-node.outputs.node-version }}.json
104104
- name: Upload GitHub Actions artifact
105105
if: ${{ env.WPT_REPORT != '' }}
106-
uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
106+
uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
107107
with:
108108
path: out/wpt/wptreport-*.json
109109
name: WPT Report for ${{ steps.setup-node.outputs.node-version }}

.github/workflows/doc.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ jobs:
3535
run: npx envinfo
3636
- name: Build
3737
run: NODE=$(command -v node) make doc-only
38-
- uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
38+
- uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
3939
with:
4040
name: docs
4141
path: out/doc

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ jobs:
8888
gh api \
8989
-H "Accept: application/vnd.github+json" \
9090
-H "X-GitHub-Api-Version: 2022-11-28" \
91-
--jq '.commits.[] | { smallSha: .sha[0:10] } + (.commit.message|capture("^(?<title>.+)\n\n(.*\n)*PR-URL: (?<prURL>.+)\n"))' \
91+
--jq '.commits.[] | { smallSha: .sha[0:10] } + (.commit.message|capture("^(?<title>.+)\n\n(.*\n)*PR-URL: (?<prURL>.+)(\n|$)"))' \
9292
"/repos/${GITHUB_REPOSITORY}/compare/v${MAJOR}.x...$GITHUB_SHA" --paginate \
9393
| node tools/actions/lint-release-proposal-commit-list.mjs "$CHANGELOG_PATH" "$GITHUB_SHA" \
9494
| while IFS= read -r PR_URL; do

.github/workflows/linters.yml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,12 @@ jobs:
154154
run: |
155155
nix-shell -I nixpkgs=./tools/nix/pkgs.nix -p 'nixfmt-tree' --run '
156156
treefmt --quiet --ci
157-
' || git --no-pager diff --exit-code
157+
' && EXIT_CODE="$?" || EXIT_CODE="$?"
158+
if [ "$EXIT_CODE" != "0" ]
159+
then
160+
git --no-pager diff || true
161+
exit "$EXIT_CODE"
162+
fi
158163
159164
lint-py:
160165
if: github.event.pull_request.draft == false

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

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -30,20 +30,16 @@ jobs:
3030

3131
validateCommitMessage:
3232
name: Notify on Push on `main` with invalid message
33-
if: github.repository == 'nodejs/node'
3433
# cannot use ubuntu-slim here because rtCamp/action-slack-notify is dockerized
3534
runs-on: ubuntu-24.04-arm
3635
steps:
37-
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
38-
with:
39-
persist-credentials: false
40-
- name: Check commit message
36+
- name: Validate commits
37+
run: echo "$COMMITS" | npx -q core-validate-commit -
4138
id: commit-check
42-
run: npx -q core-validate-commit "$COMMIT"
4339
env:
44-
COMMIT: ${{ github.event.after }}
40+
COMMITS: ${{ toJSON(github.event.commits) }}
4541
- name: Slack Notification
46-
if: ${{ failure() && steps.commit-check.conclusion == 'failure' }}
42+
if: ${{ failure() && steps.commit-check.conclusion == 'failure' && github.repository == 'nodejs/node' }}
4743
uses: rtCamp/action-slack-notify@e31e87e03dd19038e411e38ae27cbad084a90661 # 2.3.3
4844
env:
4945
SLACK_COLOR: '#DE512A'

.github/workflows/scorecard.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ jobs:
3535

3636
steps:
3737
- name: Harden Runner
38-
uses: step-security/harden-runner@5ef0c079ce82195b2a36a210272d6b661572d83e # v2.14.2
38+
uses: step-security/harden-runner@a90bcbc6539c36a85cdfeb73f7e2f433735f215b # v2.15.0
3939
with:
4040
egress-policy: audit # TODO: change to 'egress-policy: block' after couple of runs
4141

@@ -67,7 +67,7 @@ jobs:
6767
# Upload the results as artifacts (optional). Commenting out will disable uploads of run results in SARIF
6868
# format to the repository Actions tab.
6969
- name: Upload artifact
70-
uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
70+
uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
7171
with:
7272
name: SARIF file
7373
path: results.sarif

.github/workflows/test-shared.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ jobs:
130130

131131
- name: Upload tarball artifact
132132
if: ${{ github.event_name != 'workflow_dispatch' }}
133-
uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
133+
uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
134134
with:
135135
name: tarballs
136136
path: '*.tar.gz'
@@ -153,7 +153,7 @@ jobs:
153153
name: '${{ matrix.system }}: with shared libraries'
154154
runs-on: ${{ matrix.runner }}
155155
steps:
156-
- uses: actions/download-artifact@37930b1c2abaa49bbe596cd826c3c89aef350131 # v7.0.0
156+
- uses: actions/download-artifact@70fc10c6e5e1ce46ad2ea6f2b72d43f7d47b13c3 # v8.0.0
157157
if: ${{ github.event_name != 'workflow_dispatch' }}
158158
with:
159159
name: tarballs

.github/workflows/timezone-update.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,8 @@ jobs:
1616
pull-requests: write # to create a PR (gr2m/create-or-update-pull-request-action)
1717

1818
if: github.repository == 'nodejs/node'
19-
runs-on: ubuntu-slim
19+
# cannot use ubuntu-slim here because it does not have icupkg
20+
runs-on: ubuntu-latest
2021

2122
steps:
2223
- name: Checkout nodejs/node
@@ -56,7 +57,7 @@ jobs:
5657
with:
5758
author: Node.js GitHub Bot <github-bot@iojs.org>
5859
body: |
59-
This PR was generated by tools/timezone-update.yml.
60+
This PR was generated by `.github/workflows/timezone-update.yml` and `tools/update-timezone.mjs`.
6061
6162
Updates the ICU files as per the instructions present in https://github.com/nodejs/node/blob/main/doc/contributing/maintaining/maintaining-icu.md#time-zone-data
6263

.github/workflows/tools.yml

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,8 @@ permissions:
5353
jobs:
5454
tools-deps-update:
5555
if: github.repository == 'nodejs/node' || github.event_name == 'workflow_dispatch'
56-
runs-on: ubuntu-slim
56+
# cannot use ubuntu-slim here because some update scripts require Docker
57+
runs-on: ubuntu-latest
5758
strategy:
5859
fail-fast: false # Prevent other jobs from aborting if one fails
5960
matrix:
@@ -120,14 +121,6 @@ jobs:
120121
run: |
121122
make corepack-update
122123
echo "NEW_VERSION=$(node deps/corepack/dist/corepack.js --version)" >> $GITHUB_ENV
123-
- id: doc-kit
124-
subsystem: tools
125-
label: tools
126-
run: |
127-
./tools/dep_updaters/update-doc.sh > temp-output
128-
cat temp-output
129-
tail -n1 temp-output | grep "NEW_VERSION=" >> "$GITHUB_ENV" || true
130-
rm temp-output
131124
- id: googletest
132125
subsystem: deps
133126
label: dependencies, test

0 commit comments

Comments
 (0)