Skip to content

Commit 1702dc9

Browse files
docschina-botdocschina-bot
committed
Merge branch 'master' of https://github.com/rollup/rollup into sync-59c16b94
2 parents c504180 + 59c16b9 commit 1702dc9

File tree

4 files changed

+43
-102
lines changed

4 files changed

+43
-102
lines changed

‎.github/actions/install-and-cache-node-deps/action.yml‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
name: Install and Cache Node Dependencies
2+
description: Installs Node dependencies and saves cache if not already cached.
3+
runs:
4+
using: composite
5+
steps:
6+
- name: Restore Node dependencies cache
7+
id: cache-node-modules
8+
uses: actions/cache/restore@0400d5f644dc74513175e3cd8d07132dd4860809 # v4.2.4
9+
with:
10+
path: |
11+
node_modules
12+
~/.npm
13+
key: node-modules-${{ runner.os }}-${{ runner.arch }}-${{ hashFiles('package-lock.json') }}
14+
restore-keys: node-modules-${{ runner.os }}-${{ runner.arch }}
15+
- name: Install Node dependencies
16+
if: steps.cache-node-modules.outputs.cache-hit != 'true'
17+
run: npm ${{ github.ref == 'refs/heads/master' && 'ci' || 'install' }} --ignore-scripts
18+
shell: bash
19+
- name: Save Node dependencies cache
20+
if: steps.cache-node-modules.outputs.cache-hit != 'true' && github.ref == 'refs/heads/master'
21+
uses: actions/cache/save@0400d5f644dc74513175e3cd8d07132dd4860809 # v4.2.4
22+
with:
23+
path: |
24+
node_modules
25+
~/.npm
26+
key: node-modules-${{ runner.os }}-${{ runner.arch }}-${{ hashFiles('package-lock.json') }}
27+

‎.github/workflows/build-and-tests.yml‎

Lines changed: 10 additions & 68 deletions
Original file line numberDiff line numberDiff line change
@@ -36,18 +36,8 @@ jobs:
3636
uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4.4.0
3737
with:
3838
node-version: 24.6.0
39-
- name: Restore Node dependencies cache
40-
id: cache-node-modules
41-
uses: actions/cache/restore@0400d5f644dc74513175e3cd8d07132dd4860809 # v4.2.4
42-
with:
43-
path: |
44-
node_modules
45-
~/.npm
46-
key: node-modules-${{ runner.os }}-${{ runner.arch }}-${{ hashFiles('package-lock.json') }}
47-
restore-keys: node-modules-${{ runner.os }}-${{ runner.arch }}
48-
- name: Install Node dependencies
49-
if: steps.cache-node-modules.outputs.cache-hit != 'true'
50-
run: npm ci --ignore-scripts
39+
- name: Install and Cache Node Dependencies
40+
uses: ./.github/actions/install-and-cache-node-deps
5141
- name: Lint
5242
run: npm run ci:lint
5343
- name: Vulnerabilities
@@ -243,26 +233,8 @@ jobs:
243233
run: ${{ matrix.settings.setup }}
244234
if: ${{ matrix.settings.setup }}
245235
shell: bash
246-
- name: Restore Node dependencies cache
247-
id: cache-node-modules
248-
uses: actions/cache/restore@0400d5f644dc74513175e3cd8d07132dd4860809 # v4.2.4
249-
with:
250-
path: |
251-
node_modules
252-
~/.npm
253-
key: node-modules-${{ runner.os }}-${{ runner.arch }}-${{ hashFiles('package-lock.json') }}
254-
restore-keys: node-modules-${{ runner.os }}-${{ runner.arch }}
255-
- name: Install Node dependencies
256-
if: steps.cache-node-modules.outputs.cache-hit != 'true'
257-
run: npm ${{ github.ref == 'refs/heads/master' && 'ci' || 'install' }} --ignore-scripts
258-
- name: Save Node dependencies cache
259-
if: steps.cache-node-modules.outputs.cache-hit != 'true' && github.ref == 'refs/heads/master'
260-
uses: actions/cache/save@0400d5f644dc74513175e3cd8d07132dd4860809 # v4.2.4
261-
with:
262-
path: |
263-
node_modules
264-
~/.npm
265-
key: node-modules-${{ runner.os }}-${{ runner.arch }}-${{ hashFiles('package-lock.json') }}
236+
- name: Install and Cache Node Dependencies
237+
uses: ./.github/actions/install-and-cache-node-deps
266238
- name: Build in docker
267239
uses: addnab/docker-run-action@4f65fabd2431ebc8d299f8e5a018d79a769ae185 # v3
268240
if: ${{ matrix.settings.docker }}
@@ -344,18 +316,8 @@ jobs:
344316
steps:
345317
- name: Checkout Commit
346318
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
347-
- name: Restore Node dependencies cache
348-
id: cache-node-modules
349-
uses: actions/cache/restore@0400d5f644dc74513175e3cd8d07132dd4860809 # v4.2.4
350-
with:
351-
path: |
352-
node_modules
353-
~/.npm
354-
key: node-modules-${{ runner.os }}-${{ runner.arch }}-${{ hashFiles('package-lock.json') }}
355-
restore-keys: node-modules-${{ runner.os }}-${{ runner.arch }}
356-
- name: Install Node dependencies
357-
if: steps.cache-node-modules.outputs.cache-hit != 'true'
358-
run: npm install --ignore-scripts
319+
- name: Install and Cache Node Dependencies
320+
uses: ./.github/actions/install-and-cache-node-deps
359321
- name: Build JS
360322
run: npm run build:cjs
361323
- name: Download napi artifacts
@@ -450,18 +412,8 @@ jobs:
450412
with:
451413
node-version: ${{ matrix.node }}
452414
check-latest: true
453-
- name: Restore Node dependencies cache
454-
id: cache-node-modules
455-
uses: actions/cache/restore@0400d5f644dc74513175e3cd8d07132dd4860809 # v4.2.4
456-
with:
457-
path: |
458-
node_modules
459-
~/.npm
460-
key: node-modules-${{ runner.os }}-${{ runner.arch }}-${{ hashFiles('package-lock.json') }}
461-
restore-keys: node-modules-${{ runner.os }}-${{ runner.arch }}
462-
- name: Install Node dependencies
463-
if: steps.cache-node-modules.outputs.cache-hit != 'true'
464-
run: npm install --ignore-scripts
415+
- name: Install and Cache Node Dependencies
416+
uses: ./.github/actions/install-and-cache-node-deps
465417
- name: Download napi artifacts
466418
uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # v5.0.0
467419
with:
@@ -508,18 +460,8 @@ jobs:
508460
with:
509461
node-version: ${{ matrix.node }}
510462
check-latest: true
511-
- name: Restore Node dependencies cache
512-
id: cache-node-modules
513-
uses: actions/cache/restore@0400d5f644dc74513175e3cd8d07132dd4860809 # v4.2.4
514-
with:
515-
path: |
516-
node_modules
517-
~/.npm
518-
key: node-modules-${{ runner.os }}-${{ runner.arch }}-${{ hashFiles('package-lock.json') }}
519-
restore-keys: node-modules-${{ runner.os }}-${{ runner.arch }}
520-
- name: Install Node dependencies
521-
if: steps.cache-node-modules.outputs.cache-hit != 'true'
522-
run: npm install --ignore-scripts
463+
- name: Install and Cache Node Dependencies
464+
uses: ./.github/actions/install-and-cache-node-deps
523465
- name: Download all artifacts
524466
uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # v5.0.0
525467
with:

‎.github/workflows/performance-report.yml‎

Lines changed: 4 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -52,17 +52,8 @@ jobs:
5252
uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4.4.0
5353
with:
5454
node-version: 24.6.0
55-
- name: Restore Node dependencies cache
56-
id: cache-node-modules
57-
uses: actions/cache/restore@0400d5f644dc74513175e3cd8d07132dd4860809 # v4.2.4
58-
with:
59-
path: |
60-
node_modules
61-
~/.npm
62-
key: node-modules-${{ runner.os }}-${{ runner.arch }}-${{ hashFiles('package-lock.json') }}
63-
- name: Install Node dependencies
64-
if: steps.cache-node-modules.outputs.cache-hit != 'true'
65-
run: npm install --ignore-scripts
55+
- name: Install and Cache Node Dependencies
56+
uses: ./.github/actions/install-and-cache-node-deps
6657
- name: Build artefacts 123
6758
run: npm exec -- concurrently -c green,blue 'npm:build:napi -- --release' 'npm:build:cjs' && npm run build:copy-native && npm run build:bootstrap:cjs && npm run build:copy-native
6859
- name: Upload artifact
@@ -103,17 +94,8 @@ jobs:
10394
uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4.4.0
10495
with:
10596
node-version: 24.6.0
106-
- name: Restore Node dependencies cache
107-
id: cache-node-modules
108-
uses: actions/cache/restore@0400d5f644dc74513175e3cd8d07132dd4860809 # v4.2.4
109-
with:
110-
path: |
111-
node_modules
112-
~/.npm
113-
key: node-modules-${{ runner.os }}-${{ runner.arch }}-${{ hashFiles('package-lock.json') }}
114-
- name: Install dependencies
115-
if: steps.cache-node-modules.outputs.cache-hit != 'true'
116-
run: npm ci --ignore-scripts
97+
- name: Install and Cache Node Dependencies
98+
uses: ./.github/actions/install-and-cache-node-deps
11799
- name: Download all artifacts
118100
uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # v5.0.0
119101
with:

‎.github/workflows/repl-artefacts.yml‎

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -47,18 +47,8 @@ jobs:
4747
uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4.4.0
4848
with:
4949
node-version: 24.6.0
50-
- name: Restore Node dependencies cache
51-
id: cache-node-modules
52-
uses: actions/cache/restore@0400d5f644dc74513175e3cd8d07132dd4860809 # v4.2.4
53-
with:
54-
path: |
55-
node_modules
56-
~/.npm
57-
key: node-modules-${{ runner.os }}-${{ runner.arch }}-${{ hashFiles('package-lock.json') }}
58-
restore-keys: node-modules-${{ runner.os }}-${{ runner.arch }}
59-
- name: Install Node dependencies
60-
if: steps.cache-node-modules.outputs.cache-hit != 'true'
61-
run: npm install --ignore-scripts
50+
- name: Install and Cache Node Dependencies
51+
uses: ./.github/actions/install-and-cache-node-deps
6252
- name: Build artefacts
6353
run: >-
6454
npm exec -- concurrently -c green,blue,yellow 'npm:build:napi -- --release' 'npm run build:wasm' 'npm:build:cjs' &&

0 commit comments

Comments
 (0)