Skip to content

Commit e595a9a

Browse files
jpgough-msjpgough-ms
authored
Merge branch 'main' into jpgough-ms-patch-1-1
2 parents b51f4c9 + 28374cd commit e595a9a

76 files changed

Lines changed: 12239 additions & 27044 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ jobs:
5151

5252
- uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6
5353
with:
54-
node-version: 22
54+
node-version: 24
5555

5656
- name: Install dependencies
5757
run: npm ci
@@ -235,7 +235,7 @@ jobs:
235235

236236
- uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6
237237
with:
238-
node-version: 22
238+
node-version: 24
239239

240240
- name: Install dependencies
241241
run: npm ci
@@ -381,7 +381,7 @@ jobs:
381381

382382
- uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6
383383
with:
384-
node-version: 22
384+
node-version: 24
385385

386386
- name: Install dependencies
387387
run: npm ci
@@ -432,7 +432,7 @@ jobs:
432432
contains(github.event.pull_request.labels.*.name, 'automated-release')
433433
steps:
434434
- name: Harden Runner
435-
uses: step-security/harden-runner@8d3c67de8e2fe68ef647c8db1e6a09f647780f40 # v2
435+
uses: step-security/harden-runner@a5ad31d6a139d249332a2605b85202e8c0b78450 # v2
436436
with:
437437
egress-policy: audit
438438

@@ -446,7 +446,7 @@ jobs:
446446
- name: Setup Node.js
447447
uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6
448448
with:
449-
node-version: 22
449+
node-version: 24
450450
registry-url: 'https://registry.npmjs.org'
451451

452452
- name: Install dependencies

‎.github/workflows/automated-release-calm-studio.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ jobs:
4040
- name: Setup Node.js
4141
uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6
4242
with:
43-
node-version: 22
43+
node-version: 24
4444
cache: pnpm
4545
cache-dependency-path: calm-suite/calm-studio/pnpm-lock.yaml
4646
registry-url: 'https://registry.npmjs.org'

‎.github/workflows/automated-release.yml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ jobs:
5151

5252
- uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6
5353
with:
54-
node-version: 22
54+
node-version: 24
5555

5656
- name: Install dependencies
5757
run: npm ci
@@ -239,7 +239,7 @@ jobs:
239239

240240
- uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6
241241
with:
242-
node-version: 22
242+
node-version: 24
243243

244244
- name: Install dependencies
245245
run: npm ci
@@ -385,7 +385,7 @@ jobs:
385385

386386
- uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6
387387
with:
388-
node-version: 22
388+
node-version: 24
389389

390390
- name: Install dependencies
391391
run: npm ci
@@ -436,7 +436,7 @@ jobs:
436436
contains(github.event.pull_request.labels.*.name, 'automated-release')
437437
steps:
438438
- name: Harden Runner
439-
uses: step-security/harden-runner@8d3c67de8e2fe68ef647c8db1e6a09f647780f40 # v2
439+
uses: step-security/harden-runner@a5ad31d6a139d249332a2605b85202e8c0b78450 # v2
440440
with:
441441
egress-policy: audit
442442

@@ -450,7 +450,7 @@ jobs:
450450
- name: Setup Node.js
451451
uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6
452452
with:
453-
node-version: 22
453+
node-version: 24
454454
registry-url: 'https://registry.npmjs.org'
455455

456456
- name: Install dependencies

‎.github/workflows/build-and-sync-advent.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919

2020
- uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6
2121
with:
22-
node-version: 22
22+
node-version: 24
2323

2424
- name: Install dependencies
2525
run: npm ci

‎.github/workflows/build-calm-guard.yml‎

Lines changed: 23 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -11,17 +11,17 @@ on:
1111
paths:
1212
- 'calm-suite/calm-guard/**'
1313
- '.github/workflows/build-calm-guard.yml'
14+
- 'package.json'
15+
- 'package-lock.json'
1416
push:
1517
branches:
1618
- 'main'
1719
- 'release*'
1820
paths:
1921
- 'calm-suite/calm-guard/**'
2022
- '.github/workflows/build-calm-guard.yml'
21-
22-
defaults:
23-
run:
24-
working-directory: calm-suite/calm-guard
23+
- 'package.json'
24+
- 'package-lock.json'
2525

2626
jobs:
2727
lint:
@@ -31,26 +31,21 @@ jobs:
3131
- name: Checkout
3232
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
3333

34-
- name: Install pnpm
35-
uses: pnpm/action-setup@b906affcce14559ad1aafd4ab0e942779e9f58b1 # v4
36-
with:
37-
package_json_file: calm-suite/calm-guard/package.json
38-
3934
- name: Setup Node.js
40-
uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6
35+
uses: actions/setup-node@53b83947a5a98c8d113130e565377fae1a50d02f # v6
4136
with:
42-
node-version: 22
43-
cache: pnpm
44-
cache-dependency-path: calm-suite/calm-guard/pnpm-lock.yaml
37+
node-version: 24
38+
cache: npm
39+
cache-dependency-path: package-lock.json
4540

4641
- name: Install dependencies
47-
run: pnpm install --frozen-lockfile
42+
run: npm ci
4843

4944
- name: Lint
50-
run: pnpm lint
45+
run: npm run lint --workspace=calmguard
5146

5247
- name: Typecheck
53-
run: pnpm typecheck
48+
run: npm run typecheck --workspace=calmguard
5449

5550
test:
5651
name: Test
@@ -60,23 +55,18 @@ jobs:
6055
- name: Checkout
6156
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
6257

63-
- name: Install pnpm
64-
uses: pnpm/action-setup@b906affcce14559ad1aafd4ab0e942779e9f58b1 # v4
65-
with:
66-
package_json_file: calm-suite/calm-guard/package.json
67-
6858
- name: Setup Node.js
69-
uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6
59+
uses: actions/setup-node@53b83947a5a98c8d113130e565377fae1a50d02f # v6
7060
with:
71-
node-version: 22
72-
cache: pnpm
73-
cache-dependency-path: calm-suite/calm-guard/pnpm-lock.yaml
61+
node-version: 24
62+
cache: npm
63+
cache-dependency-path: package-lock.json
7464

7565
- name: Install dependencies
76-
run: pnpm install --frozen-lockfile
66+
run: npm ci
7767

7868
- name: Run tests
79-
run: pnpm test:run
69+
run: npm run test:run --workspace=calmguard
8070

8171
build:
8272
name: Build
@@ -88,20 +78,15 @@ jobs:
8878
- name: Checkout
8979
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
9080

91-
- name: Install pnpm
92-
uses: pnpm/action-setup@b906affcce14559ad1aafd4ab0e942779e9f58b1 # v4
93-
with:
94-
package_json_file: calm-suite/calm-guard/package.json
95-
9681
- name: Setup Node.js
97-
uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6
82+
uses: actions/setup-node@53b83947a5a98c8d113130e565377fae1a50d02f # v6
9883
with:
99-
node-version: 22
100-
cache: pnpm
101-
cache-dependency-path: calm-suite/calm-guard/pnpm-lock.yaml
84+
node-version: 24
85+
cache: npm
86+
cache-dependency-path: package-lock.json
10287

10388
- name: Install dependencies
104-
run: pnpm install --frozen-lockfile
89+
run: npm ci
10590

10691
- name: Build
107-
run: pnpm build
92+
run: npm run build --workspace=calmguard

‎.github/workflows/build-calm-hub-ui.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
- name: Setup Node.js
2626
uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6
2727
with:
28-
node-version: v22
28+
node-version: 24
2929

3030
- name: Install workspace
3131
run: npm ci

‎.github/workflows/build-calm-models.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
- name: Setup Node.js
2626
uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6
2727
with:
28-
node-version: v22
28+
node-version: 24
2929

3030
- name: Install workspace
3131
run: npm ci

‎.github/workflows/build-calm-server.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
- name: Setup Node.js
2626
uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6
2727
with:
28-
node-version: v22
28+
node-version: 24
2929

3030
- name: Install workspace
3131
run: npm ci

‎.github/workflows/build-calm-studio-desktop.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ jobs:
4444
version: 9
4545
- uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6
4646
with:
47-
node-version: 22
47+
node-version: 24
4848
cache: pnpm
4949
cache-dependency-path: calm-suite/calm-studio/pnpm-lock.yaml
5050
- run: pnpm install --frozen-lockfile
@@ -94,7 +94,7 @@ jobs:
9494
version: 9
9595
- uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6
9696
with:
97-
node-version: 22
97+
node-version: 24
9898
cache: pnpm
9999
cache-dependency-path: calm-suite/calm-studio/pnpm-lock.yaml
100100
- run: cd calm-suite/calm-studio && pnpm install --frozen-lockfile

‎.github/workflows/build-calm-studio.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ jobs:
3939
- name: Setup Node.js
4040
uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6
4141
with:
42-
node-version: 22
42+
node-version: 24
4343
cache: pnpm
4444
cache-dependency-path: calm-suite/calm-studio/pnpm-lock.yaml
4545

@@ -75,7 +75,7 @@ jobs:
7575
- name: Setup Node.js
7676
uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6
7777
with:
78-
node-version: 22
78+
node-version: 24
7979
cache: pnpm
8080
cache-dependency-path: calm-suite/calm-studio/pnpm-lock.yaml
8181

0 commit comments

Comments
 (0)
⚡