Skip to content

Commit 8723780

Browse files
committed
Merge branch 'master' of https://github.com/rollup/rollup into sync-d96ffa96
2 parents fab597c + d96ffa9 commit 8723780

File tree

7 files changed

+546
-531
lines changed

7 files changed

+546
-531
lines changed

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -263,7 +263,7 @@ jobs:
263263
with:
264264
version: 0.14.1
265265
- name: Install cargo-zigbuild
266-
uses: taiki-e/install-action@80466ef8efa80486cdfbddf929453a4f3565c791 # v2.62.34
266+
uses: taiki-e/install-action@1d76762916ba18e4f0c3b2f71fee3da83a279745 # v2.62.41
267267
if: ${{ matrix.settings.cross == 'zig' }}
268268
env:
269269
GITHUB_TOKEN: ${{ github.token }}
@@ -312,14 +312,14 @@ jobs:
312312
rust/target/
313313
key: ${{ matrix.settings.name || matrix.settings.target }}-cargo-${{ matrix.settings.host }}-${{ hashFiles('rust/Cargo.lock') }}
314314
- name: Upload wasm artifact
315-
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
315+
uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
316316
with:
317317
name: bindings-${{ matrix.settings.name }}
318318
path: ${{ matrix.settings.path }}
319319
if-no-files-found: error
320320
if: ${{ matrix.settings.is-wasm-build }}
321321
- name: Upload napi artifact
322-
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
322+
uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
323323
with:
324324
name: bindings-${{ matrix.settings.target }}
325325
path: ${{ env.APP_NAME }}.*.node
@@ -370,7 +370,7 @@ jobs:
370370
- name: Build JS
371371
run: npm run build:cjs
372372
- name: Download napi artifacts
373-
uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # v5.0.0
373+
uses: actions/download-artifact@018cc2cf5baa6db3ef3c5f8a56943fffe632ef53 # v6.0.0
374374
with:
375375
name: bindings-${{ matrix.settings.target }}
376376
path: dist/
@@ -464,12 +464,12 @@ jobs:
464464
- name: Install and Cache Node Dependencies
465465
uses: ./.github/actions/install-and-cache-node-deps
466466
- name: Download napi artifacts
467-
uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # v5.0.0
467+
uses: actions/download-artifact@018cc2cf5baa6db3ef3c5f8a56943fffe632ef53 # v6.0.0
468468
with:
469469
name: bindings-${{ matrix.settings.target }}
470470
path: .
471471
- name: Download wasm artifacts
472-
uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # v5.0.0
472+
uses: actions/download-artifact@018cc2cf5baa6db3ef3c5f8a56943fffe632ef53 # v6.0.0
473473
with:
474474
name: bindings-wasm
475475
- name: Build and test Rollup
@@ -515,7 +515,7 @@ jobs:
515515
- name: Install and Cache Node Dependencies
516516
uses: ./.github/actions/install-and-cache-node-deps
517517
- name: Download all artifacts
518-
uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # v5.0.0
518+
uses: actions/download-artifact@018cc2cf5baa6db3ef3c5f8a56943fffe632ef53 # v6.0.0
519519
with:
520520
path: artifacts
521521
- name: Copy wasm files

.github/workflows/performance-report.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ jobs:
5959
- name: Build artefacts 123
6060
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
6161
- name: Upload artifact
62-
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
62+
uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
6363
with:
6464
name: ${{ matrix.settings.name }}
6565
path: dist/
@@ -99,7 +99,7 @@ jobs:
9999
- name: Install and Cache Node Dependencies
100100
uses: ./.github/actions/install-and-cache-node-deps
101101
- name: Download all artifacts
102-
uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # v5.0.0
102+
uses: actions/download-artifact@018cc2cf5baa6db3ef3c5f8a56943fffe632ef53 # v6.0.0
103103
with:
104104
path: _benchmark
105105
- name: Change rollup import in internal benchmark

0 commit comments

Comments
 (0)