Skip to content

Commit 50f7381

Browse files
authored
Merge pull request #1167 from martijnversluis/master
sync upstream
2 parents e488dbd + 62e0ff4 commit 50f7381

File tree

2 files changed

+360
-346
lines changed

2 files changed

+360
-346
lines changed

.github/workflows/ci.yml

Lines changed: 17 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,12 @@ jobs:
1818
name: Ubuntu NodeJS ${{ matrix.node-version }} sample
1919
steps:
2020
- uses: actions/checkout@v5
21+
- name: Enable Corepack
22+
run: corepack enable
2123
- name: Use Node.js ${{ matrix.node-version }}
22-
uses: actions/setup-node@v4
24+
uses: actions/setup-node@v5
2325
with:
2426
node-version: ${{ matrix.node-version }}
25-
- name: Enable Corepack
26-
run: corepack enable
2727
- name: Install node modules
2828
run: yarn install
2929
- name: Run tests
@@ -60,12 +60,18 @@ jobs:
6060
name: Windows NodeJS ${{ matrix.node-version }} sample
6161
steps:
6262
- uses: actions/checkout@v5
63-
- name: Use Node.js ${{ matrix.node-version }}
64-
uses: actions/setup-node@v4
63+
- uses: actions/setup-node@v5
6564
with:
6665
node-version: ${{ matrix.node-version }}
67-
- name: Enable Corepack
68-
run: corepack enable
66+
cache: npm
67+
68+
- run: corepack enable
69+
- run: corepack prepare $(cat package.json | jq ".packageManager") --activate
70+
71+
- uses: actions/setup-node@v5
72+
with:
73+
node-version: ${{ matrix.node-version }}
74+
cache: yarn
6975
- name: Install node modules
7076
run: yarn install
7177
- name: Run tests
@@ -79,12 +85,12 @@ jobs:
7985
name: Generate typedoc
8086
steps:
8187
- uses: actions/checkout@v5
88+
- name: Enable Corepack
89+
run: corepack enable
8290
- name: Use Node.js ${{ matrix.node-version }}
83-
uses: actions/setup-node@v4
91+
uses: actions/setup-node@v5
8492
with:
8593
node-version: ${{ matrix.node-version }}
86-
- name: Enable Corepack
87-
run: corepack enable
8894
- name: Install node modules
8995
run: yarn install
9096
- name: Build
@@ -105,7 +111,7 @@ jobs:
105111
name: Verify NodeJS installation
106112
steps:
107113
- name: Use Node.js ${{ matrix.node-version }}
108-
uses: actions/setup-node@v4
114+
uses: actions/setup-node@v5
109115
with:
110116
node-version: ${{ matrix.node-version }}
111117
- name: Enable Corepack

0 commit comments

Comments
 (0)