Skip to content

Commit e0e749b

Browse files
committed
ci: use node/pnpm versions from config files [skip ci]
1 parent ac7fe2d commit e0e749b

File tree

3 files changed

+12
-34
lines changed

3 files changed

+12
-34
lines changed

.github/workflows/CI.yml

Lines changed: 8 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -20,16 +20,11 @@ jobs:
2020
Build:
2121
runs-on: ${{ matrix.os }}
2222
name: Build
23-
if: ${{ !contains(github.event.head_commit.message, '[skip ci]') }}
2423
strategy:
2524
fail-fast: false
2625
matrix:
2726
os:
2827
- ubuntu-22.04
29-
node:
30-
- 22.6.0
31-
pnpm:
32-
- 9.11.0
3328
steps:
3429
- uses: actions/checkout@v4
3530
with:
@@ -38,12 +33,10 @@ jobs:
3833
- name: Setup Node
3934
uses: actions/setup-node@v4
4035
with:
41-
node-version: ${{ matrix.node }}
36+
node-version-file: "./.nvmrc"
4237

4338
- name: Setup Pnpm
44-
uses: pnpm/action-setup@v2
45-
with:
46-
version: ${{ matrix.pnpm }}
39+
uses: pnpm/action-setup@v4
4740

4841
- name: Install
4942
run: |
@@ -84,7 +77,6 @@ jobs:
8477
BuildExecutable:
8578
name: Build-Executable-${{ matrix.os }}
8679
needs: [Build]
87-
if: ${{ !contains(github.event.head_commit.message, '[skip ci]') }}
8880
runs-on: ${{ matrix.os }}
8981
strategy:
9082
fail-fast: false
@@ -94,10 +86,6 @@ jobs:
9486
- ubuntu-24.04
9587
- macos-13
9688
- macos-14 # arm64
97-
node:
98-
- 22
99-
pnpm:
100-
- 9.11.0
10189
steps:
10290
- uses: actions/checkout@v4
10391

@@ -109,12 +97,10 @@ jobs:
10997
- name: Setup Node
11098
uses: actions/setup-node@v4
11199
with:
112-
node-version: ${{ matrix.node }}
100+
node-version-file: "./.nvmrc"
113101

114102
- name: Setup Pnpm
115-
uses: pnpm/action-setup@v2
116-
with:
117-
version: ${{ matrix.pnpm }}
103+
uses: pnpm/action-setup@v4
118104

119105
- name: Cache node_modules
120106
uses: actions/cache@v4
@@ -123,7 +109,7 @@ jobs:
123109
~/.pnpm-store
124110
D:\.pnpm-store
125111
./node_modules
126-
key: "setupcpp-node_modules-cache-OS:${{ matrix.os }}-node:${{ matrix.node }}-pnpm:${{ matrix.pnpm }}-${{ hashFiles('./.npmrc') }}-deps:${{ hashFiles('./package.json') }}"
112+
key: "setupcpp-node_modules-cache-OS:${{ matrix.os }}-${{ hashFiles('./.npmrc', './package.json', '.nvmrc', './packages/*/package.json') }}"
127113
restore-keys: |
128114
"setupcpp-node_modules-cache-OS:${{ matrix.os }}-"
129115
@@ -146,7 +132,6 @@ jobs:
146132

147133
Test:
148134
name: Test-${{ matrix.os }}
149-
if: ${{ !contains(github.event.head_commit.message, '[skip ci]') }}
150135
needs: [Build]
151136
runs-on: ${{ matrix.os }}
152137
strategy:
@@ -161,10 +146,6 @@ jobs:
161146
- macos-14
162147
- macos-13
163148
- macos-12
164-
node:
165-
- 22
166-
pnpm:
167-
- 9.11.0
168149
steps:
169150
- uses: actions/checkout@v4
170151
with:
@@ -178,12 +159,10 @@ jobs:
178159
- name: Setup Node
179160
uses: actions/setup-node@v4
180161
with:
181-
node-version: ${{ matrix.node }}
162+
node-version-file: "./.nvmrc"
182163

183164
- name: Setup Pnpm
184-
uses: pnpm/action-setup@v2
185-
with:
186-
version: ${{ matrix.pnpm }}
165+
uses: pnpm/action-setup@v4
187166

188167
- name: Cache node_modules
189168
uses: actions/cache@v4
@@ -192,7 +171,7 @@ jobs:
192171
~/.pnpm-store
193172
D:\.pnpm-store
194173
./node_modules
195-
key: "setupcpp-node_modules-cache-OS:${{ matrix.os }}-node:${{ matrix.node }}-pnpm:${{ matrix.pnpm }}-${{ hashFiles('./.npmrc') }}-deps:${{ hashFiles('./package.json') }}"
174+
key: "setupcpp-node_modules-cache-OS:${{ matrix.os }}-${{ hashFiles('./.npmrc', './package.json', '.nvmrc', './packages/*/package.json') }}"
196175
restore-keys: |
197176
"setupcpp-node_modules-cache-OS:${{ matrix.os }}-"
198177
@@ -234,18 +213,13 @@ jobs:
234213
235214
Docker:
236215
name: Docker-${{ matrix.container.image }}
237-
if: ${{ !contains(github.event.head_commit.message, '[skip ci]') }}
238216
needs: [Build]
239217
runs-on: ${{ matrix.os }}
240218
strategy:
241219
fail-fast: false
242220
matrix:
243221
os:
244222
- ubuntu-24.04
245-
node:
246-
- 22
247-
pnpm:
248-
- 9.11.0
249223
container:
250224
- { file: "ubuntu-llvm.dockerfile", image: "setup-cpp-ubuntu-llvm", tag: "22.04-0.44.0" }
251225
- { file: "fedora-llvm.dockerfile", image: "setup-cpp-fedora-llvm", tag: "40-0.44.0" }

.vscode/settings.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,9 @@
2626
"[yaml]": {
2727
"editor.defaultFormatter": "dprint.dprint"
2828
},
29+
"[github-actions-workflow]": {
30+
"editor.defaultFormatter": "dprint.dprint"
31+
},
2932
"cSpell.advanced.feature.useReferenceProviderWithRename": true,
3033
"cSpell.checkOnlyEnabledFileTypes": false,
3134
"cSpell.numSuggestions": 3,

cspell.config.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,7 @@ words:
8181
- noreply
8282
- nothrow
8383
- npmrc
84+
- nvmrc
8485
- Opencppcoverage
8586
- OSSDK
8687
- papm

0 commit comments

Comments
 (0)