Skip to content

Commit eca3523

Browse files
Merge pull request #2207 from markscott-ms/trusted-publishing
chore(ci): fix workspace ordering; use npm 11 for publishing
2 parents 11df944 + a42d234 commit eca3523

File tree

3 files changed

+40
-8
lines changed

3 files changed

+40
-8
lines changed

.github/workflows/automated-release-calm-server.yml

Lines changed: 19 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,11 @@ jobs:
5353
with:
5454
node-version: 22
5555

56-
- run: npm ci
56+
- name: Update to npm 11
57+
run: npm install -g npm@11
58+
59+
- name: Install dependencies
60+
run: npm ci
5761

5862
- name: Check for existing changelog/version PRs
5963
run: |
@@ -236,7 +240,12 @@ jobs:
236240
with:
237241
node-version: 22
238242

239-
- run: npm ci
243+
- name: Update to npm 11
244+
run: npm install -g npm@11
245+
246+
- name: Install dependencies
247+
run: npm ci
248+
240249
- run: npm run build:calm-server
241250

242251
- name: Create version update PR
@@ -380,7 +389,11 @@ jobs:
380389
with:
381390
node-version: 22
382391

383-
- run: npm ci
392+
- name: Update to npm 11
393+
run: npm install -g npm@11
394+
395+
- name: Install dependencies
396+
run: npm ci
384397

385398
- name: Create draft release
386399
env:
@@ -445,6 +458,9 @@ jobs:
445458
node-version: 22
446459
registry-url: 'https://registry.npmjs.org'
447460

461+
- name: Update to npm 11
462+
run: npm install -g npm@11
463+
448464
- name: Install dependencies
449465
run: npm ci
450466

.github/workflows/automated-release.yml

Lines changed: 19 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,11 @@ jobs:
5353
with:
5454
node-version: 22
5555

56-
- run: npm ci
56+
- name: Update to npm 11
57+
run: npm install -g npm@11
58+
59+
- name: Install dependencies
60+
run: npm ci
5761

5862
- name: Check for existing changelog/version PRs
5963
run: |
@@ -240,7 +244,12 @@ jobs:
240244
with:
241245
node-version: 22
242246

243-
- run: npm ci
247+
- name: Update to npm 11
248+
run: npm install -g npm@11
249+
250+
- name: Install dependencies
251+
run: npm ci
252+
244253
- run: npm run build:cli
245254

246255
- name: Create version update PR
@@ -384,7 +393,11 @@ jobs:
384393
with:
385394
node-version: 22
386395

387-
- run: npm ci
396+
- name: Update to npm 11
397+
run: npm install -g npm@11
398+
399+
- name: Install dependencies
400+
run: npm ci
388401

389402
- name: Create draft release
390403
env:
@@ -449,6 +462,9 @@ jobs:
449462
node-version: 22
450463
registry-url: 'https://registry.npmjs.org'
451464

465+
- name: Update to npm 11
466+
run: npm install -g npm@11
467+
452468
- name: Install dependencies
453469
run: npm ci
454470

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@
77
},
88
"workspaces": [
99
"calm-models",
10-
"calm-server",
1110
"calm-widgets",
1211
"calm-ai",
1312
"shared",
1413
"cli",
14+
"calm-server",
1515
"docs",
1616
"calm-hub-ui",
1717
"calm-plugins/vscode"
@@ -107,4 +107,4 @@
107107
"minimatch": "^3.1.4"
108108
}
109109
}
110-
}
110+
}

0 commit comments

Comments
 (0)