Skip to content

Commit 0360ef6

Browse files
committed
Merge branch 'master' of https://github.com/rollup/rollup into sync-18ee41ba
2 parents 672977c + 18ee41b commit 0360ef6

File tree

8 files changed

+2093
-682
lines changed

8 files changed

+2093
-682
lines changed

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

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ jobs:
4141
- name: Lint
4242
run: npm run ci:lint
4343
- name: Vulnerabilities
44-
run: npm audit
44+
run: npm run check-audit
4545
- name: Optional Dependencies
4646
run: npm run test:package
4747
- name: Generated Code
@@ -263,7 +263,7 @@ jobs:
263263
with:
264264
version: 0.14.1
265265
- name: Install cargo-zigbuild
266-
uses: taiki-e/install-action@f535147c22906d77695e11cb199e764aa610a4fc # v2.62.46
266+
uses: taiki-e/install-action@6cc14f7f2f4b3129aff07a8b071d2d4f2733465d # v2.62.50
267267
if: ${{ matrix.settings.cross == 'zig' }}
268268
env:
269269
GITHUB_TOKEN: ${{ github.token }}
@@ -340,9 +340,10 @@ jobs:
340340
- arch: aarch64
341341
distro: alpine_latest
342342
target: aarch64-unknown-linux-musl
343-
- arch: armv7
344-
distro: ubuntu_latest
345-
target: armv7-unknown-linux-gnueabihf
343+
# - arch: armv7
344+
# distro: ubuntu_latest
345+
# target: armv7-unknown-linux-gnueabihf
346+
# use-nvm: true
346347
# There is a bug that hangs the build when running npm
347348
# - arch: armv7
348349
# distro: alpine_latest
@@ -356,10 +357,10 @@ jobs:
356357
distro: ubuntu_latest
357358
target: s390x-unknown-linux-gnu
358359
use-nvm: true
359-
# I could not find a way to install Node without compiling from source
360-
# - arch: riscv64
361-
# distro: ubuntu_latest
362-
# target: riscv64gc-unknown-linux-gnu
360+
# I could not find a way to install Node without compiling from source
361+
# - arch: riscv64
362+
# distro: ubuntu_latest
363+
# target: riscv64gc-unknown-linux-gnu
363364
runs-on: ubuntu-latest
364365
timeout-minutes: 120
365366
steps:

audit-resolve.json

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
{
2+
"decisions": {
3+
"1108265|@mermaid-js/mermaid-cli>@mermaid-js/mermaid-zenuml>@zenuml/core>pino>fast-redact": {
4+
"decision": "ignore",
5+
"madeAt": 1763187616543,
6+
"expiresAt": 1765779605071
7+
},
8+
"1109754|nyc>@istanbuljs/load-nyc-config>js-yaml": {
9+
"decision": "ignore",
10+
"madeAt": 1763187626665,
11+
"expiresAt": 1765779605071
12+
}
13+
},
14+
"rules": {},
15+
"version": 1
16+
}

0 commit comments

Comments
 (0)