Skip to content

Commit e8d036a

Browse files
zhaojjiangzhaojjiang
authored
Merge branch 'nodejs:main' into main
2 parents b7bba4d + 4aadb24 commit e8d036a

File tree

80 files changed

+1312
-445
lines changed

Some content is hidden

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

80 files changed

+1312
-445
lines changed

‎.github/workflows/automatic-updates.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@ jobs:
1212
pull-requests: write
1313

1414
steps:
15-
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
15+
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
1616

1717
- name: Run automation script
18-
uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
18+
uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
1919
id: updt
2020
with:
2121
result-encoding: string

‎.github/workflows/build-test.yml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,17 +22,17 @@ jobs:
2222

2323
steps:
2424
- name: Checkout
25-
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
25+
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
2626

2727
- name: Calculate file differences
2828
id: diff
29-
uses: tj-actions/changed-files@6cb76d07bee4c9772c6882c06c37837bf82a04d3 # v46.0.4
29+
uses: tj-actions/changed-files@24d32ffd492484c1d75e0c0b894501ddb9d30d62 # v47.0.0
3030
with:
3131
json: true
3232
escape_json: false
3333

3434
- name: Generate testing matrix
35-
uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
35+
uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
3636
id: generator
3737
with:
3838
github-token: ${{ secrets.GITHUB_TOKEN }}
@@ -59,17 +59,17 @@ jobs:
5959

6060
steps:
6161
- name: Get short node version
62-
uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
62+
uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
6363
id: short-version
6464
with:
6565
result-encoding: string
6666
script: return "${{ matrix.version }}".split('.')[0]
6767

6868
- name: Checkout
69-
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
69+
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
7070

7171
- name: Build image
72-
uses: docker/build-push-action@471d1dc4e07e5cdedd4c2171150001c434f0b7a4 # v6.15.0
72+
uses: docker/build-push-action@263435318d21b8e681c14492fe198d362a7d2c83 # v6.18.0
7373
with:
7474
push: false
7575
load: true

‎.github/workflows/doctoc.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ jobs:
1414
name: Doc TOC Check
1515
runs-on: ubuntu-latest
1616
steps:
17-
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
18-
- uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4.4.0
17+
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
18+
- uses: actions/setup-node@2028fbc5c25fe9cf00d9f06a71cc4710d4507903 # v6.0.0
1919
with:
2020
node-version: 'lts/*'
2121
- name: Install doctoc

‎.github/workflows/eclint.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ jobs:
99
eclint:
1010
runs-on: ubuntu-latest
1111
steps:
12-
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
13-
- uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4.4.0
12+
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
13+
- uses: actions/setup-node@2028fbc5c25fe9cf00d9f06a71cc4710d4507903 # v6.0.0
1414
with:
1515
node-version: 'lts/*'
1616
- run: npm i -g eclint

‎.github/workflows/markdown-link-check.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,11 @@ jobs:
1313
markdown-link-check:
1414
runs-on: ubuntu-latest
1515
steps:
16-
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
17-
- uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4.4.0
16+
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
17+
- uses: actions/setup-node@2028fbc5c25fe9cf00d9f06a71cc4710d4507903 # v6.0.0
1818
with:
1919
node-version: 'lts/*'
2020
- name: Install markdown-link-check
21-
run: npm i -g markdown-link-check@3.11.0
21+
run: npm i -g markdown-link-check@3.14.1
2222
- name: Run markdown-link-check on MD files
2323
run: find . -name "*.md" | xargs -n 1 markdown-link-check -c markdown_link_check_config.json -q

‎.github/workflows/missing-checksum.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
test:
1414
runs-on: ubuntu-latest
1515
steps:
16-
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
16+
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
1717

1818
- name: Count number of Alpine Dockersfiles without CHECKSUM
1919
run: |

‎.github/workflows/official-pr.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,14 +21,14 @@ jobs:
2121

2222
steps:
2323
- name: Checkout the docker-node repo
24-
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
24+
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
2525
with:
2626
path: docker-node
2727
ref: ${{ github.base_ref }}
2828
fetch-depth: 50
2929

3030
- name: Checkout the official-images repo
31-
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
31+
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
3232
with:
3333
path: official-images
3434
repository: docker-library/official-images
@@ -58,7 +58,7 @@ jobs:
5858
echo "Pull Request URL - ${{ steps.create-pr.outputs.pull-request-url }}"
5959
6060
- name: Create PR comment
61-
uses: peter-evans/create-or-update-comment@71345be0265236311c031f5c7866368bd1eff043 # v4.0.0
61+
uses: peter-evans/create-or-update-comment@e8674b075228eee787fea43ef493e45ece1004c9 # v5.0.0
6262
if: ${{ steps.create-pr.outputs.pull-request-url != '' }}
6363
with:
6464
issue-number: ${{ github.event.pull_request.number }}

‎.github/workflows/scorecard.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,12 +32,12 @@ jobs:
3232

3333
steps:
3434
- name: "Checkout code"
35-
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
35+
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
3636
with:
3737
persist-credentials: false
3838

3939
- name: "Run analysis"
40-
uses: ossf/scorecard-action@f49aabe0b5af0936a0987cfb85d86b75731b0186 # v2.4.1
40+
uses: ossf/scorecard-action@4eaacf0543bb3f2c246792bd56e8cdeffafb205a # v2.4.3
4141
with:
4242
results_file: results.sarif
4343
results_format: sarif
@@ -68,6 +68,6 @@ jobs:
6868
# Upload the results to GitHub's code scanning dashboard (optional).
6969
# Commenting out will disable upload of results to your repo's Code Scanning dashboard
7070
- name: "Upload to code-scanning"
71-
uses: github/codeql-action/upload-sarif@v3
71+
uses: github/codeql-action/upload-sarif@v4
7272
with:
7373
sarif_file: results.sarif

‎.github/workflows/shfmt.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,12 @@ jobs:
1212
shfmt:
1313
runs-on: ubuntu-latest
1414
steps:
15-
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
15+
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
1616
- run: docker run -v "$(pwd)":/sh -w /sh peterdavehello/shfmt:2.6.3 shfmt -sr -i 2 -l -w -ci .
1717
- run: git diff --color --exit-code
1818

1919
shellcheck:
2020
runs-on: ubuntu-latest
2121
steps:
22-
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
22+
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
2323
- run: shellcheck *.sh

‎20/alpine3.21/Dockerfile‎

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
FROM alpine:3.21
22

3-
ENV NODE_VERSION 20.19.0
3+
ENV NODE_VERSION=20.19.5
44

55
RUN addgroup -g 1000 node \
66
&& adduser -u 1000 -G node -s /bin/sh -D node \
@@ -10,7 +10,7 @@ RUN addgroup -g 1000 node \
1010
curl \
1111
&& ARCH= OPENSSL_ARCH='linux*' && alpineArch="$(apk --print-arch)" \
1212
&& case "${alpineArch##*-}" in \
13-
x86_64) ARCH='x64' CHECKSUM="b2a58593a9de31ca444fe095cb2db0674bdccab426ee6803110ca17867bdac26" OPENSSL_ARCH=linux-x86_64;; \
13+
x86_64) ARCH='x64' CHECKSUM="3ea6ae2833f2d75e4d84731a9c01f50eff5198d78f724fa673281468e1c2077b" OPENSSL_ARCH=linux-x86_64;; \
1414
x86) OPENSSL_ARCH=linux-elf;; \
1515
aarch64) OPENSSL_ARCH=linux-aarch64;; \
1616
arm*) OPENSSL_ARCH=linux-armv4;; \
@@ -41,7 +41,7 @@ RUN addgroup -g 1000 node \
4141
&& export GNUPGHOME="$(mktemp -d)" \
4242
# gpg keys listed at https://github.com/nodejs/node#release-keys
4343
&& for key in \
44-
C0D6248439F1D5604AAFFB4021D900FFDB233756 \
44+
5BE8A3F6C8A5C01D106C0AD820B1A390B168D356 \
4545
DD792F5973C6DE52C432CBDAC77ABFA00DDBF2B7 \
4646
CC68F5A3106FF448322E48ED27F5E38D5B0A215F \
4747
8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \
@@ -50,8 +50,8 @@ RUN addgroup -g 1000 node \
5050
108F52B48DB57BB0CC439B2997B01419BD92F80A \
5151
A363A499291CBBC940DD62E41F10027AF002F8B0 \
5252
; do \
53-
gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \
54-
gpg --batch --keyserver keyserver.ubuntu.com --recv-keys "$key" ; \
53+
{ gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" && gpg --batch --fingerprint "$key"; } || \
54+
{ gpg --batch --keyserver keyserver.ubuntu.com --recv-keys "$key" && gpg --batch --fingerprint "$key"; } ; \
5555
done \
5656
&& curl -fsSLO --compressed "https://nodejs.org/dist/v$NODE_VERSION/node-v$NODE_VERSION.tar.xz" \
5757
&& curl -fsSLO --compressed "https://nodejs.org/dist/v$NODE_VERSION/SHASUMS256.txt.asc" \
@@ -75,18 +75,19 @@ RUN addgroup -g 1000 node \
7575
&& apk del .build-deps \
7676
# smoke tests
7777
&& node --version \
78-
&& npm --version
78+
&& npm --version \
79+
&& rm -rf /tmp/*
7980

80-
ENV YARN_VERSION 1.22.22
81+
ENV YARN_VERSION=1.22.22
8182

8283
RUN apk add --no-cache --virtual .build-deps-yarn curl gnupg tar \
8384
# use pre-existing gpg directory, see https://github.com/nodejs/docker-node/pull/1895#issuecomment-1550389150
8485
&& export GNUPGHOME="$(mktemp -d)" \
8586
&& for key in \
8687
6A010C5166006599AA17F08146C2130DFD2497F5 \
8788
; do \
88-
gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \
89-
gpg --batch --keyserver keyserver.ubuntu.com --recv-keys "$key" ; \
89+
{ gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" && gpg --batch --fingerprint "$key"; } || \
90+
{ gpg --batch --keyserver keyserver.ubuntu.com --recv-keys "$key" && gpg --batch --fingerprint "$key"; } ; \
9091
done \
9192
&& curl -fsSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz" \
9293
&& curl -fsSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz.asc" \

0 commit comments

Comments
 (0)