Skip to content

Commit 100e65a

Browse files
committed
chore: Use Yarn v4
1 parent de74566 commit 100e65a

9 files changed

Lines changed: 6658 additions & 4624 deletions

File tree

.github/workflows/cdk-test.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,10 @@ jobs:
2727
cache: "yarn"
2828
cache-dependency-path: cdk/yarn.lock
2929

30+
- run: corepack enable
31+
3032
- name: Install
31-
run: yarn install --frozen-lockfile
33+
run: yarn install --immutable
3234

3335
- name: Test
3436
run: yarn test

.github/workflows/notification-worker-lambdas.yml

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@ jobs:
3434

3535
- uses: actions/setup-node@v6
3636
with:
37-
cache: npm
38-
cache-dependency-path: cdk/package-lock.json
37+
cache: yarn
38+
cache-dependency-path: cdk/yarn.lock
3939
node-version-file: .nvmrc
4040

4141
- uses: aws-actions/configure-aws-credentials@v2
@@ -74,20 +74,22 @@ jobs:
7474
NOTIFICATION_LAMBDA_REPOSITORY_URL: ${{ secrets.NOTIFICATION_LAMBDA_REPOSITORY_URL }}
7575
BUILD_NUMBER: ${{ github.run_number }}
7676

77+
- run: corepack enable
78+
7779
- name: CDK synth (worker lambda cdk directory)
7880
working-directory: cdk
7981
run: |
80-
yarn install
82+
yarn install --immutable
8183
yarn test
8284
yarn synth
8385
8486
- name: CDK synth (root cdk directory)
8587
working-directory: cdk
8688
run: |
87-
npm install
88-
npm run lint
89-
npm test
90-
npm run synth
89+
yarn install --immutable
90+
yarn lint
91+
yarn test
92+
yarn synth
9193
9294
- name: Upload to riff-raff
9395
uses: guardian/actions-riff-raff@v4

.github/workflows/registration.yml

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -35,17 +35,19 @@ jobs:
3535

3636
- uses: actions/setup-node@v6
3737
with:
38-
cache: npm
39-
cache-dependency-path: cdk/package-lock.json
38+
cache: yarn
39+
cache-dependency-path: cdk/yarn.lock
4040
node-version-file: .nvmrc
4141

42+
- run: corepack enable
43+
4244
- name: CDK synth
4345
run: |
4446
cd cdk
45-
npm install
46-
npm run lint
47-
npm test
48-
npm run synth
47+
yarn install --immutable
48+
yarn lint
49+
yarn test
50+
yarn synth
4951
5052
- name: Compile, test and package
5153
run: sbt "project common" "compile" "test" "project registration" "compile" "test" "debian:packageBin"

.github/workflows/slo-monitor.yml

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,8 @@ jobs:
3333

3434
- uses: actions/setup-node@v6
3535
with:
36-
cache: npm
37-
cache-dependency-path: cdk/package-lock.json
36+
cache: yarn
37+
cache-dependency-path: cdk/yarn.lock
3838
node-version-file: .nvmrc
3939

4040
- name: Compile, test and assembly
@@ -53,13 +53,15 @@ jobs:
5353
- name: Copy jar to root
5454
run: cp slomonitor/target/scala-*/slomonitor.jar .
5555

56+
- run: corepack enable
57+
5658
- name: CDK synth
5759
run: |
5860
cd cdk
59-
npm install
60-
npm run lint
61-
npm test
62-
npm run synth
61+
yarn install --immutable
62+
yarn lint
63+
yarn test
64+
yarn synth
6365
6466
- name: Upload to riff-raff
6567
uses: guardian/actions-riff-raff@v4

cdk/.yarn/install-state.gz

589 KB
Binary file not shown.

cdk/.yarnrc.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
nodeLinker: node-modules

cdk/README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@ these with almost identical configurations.
1717

1818
### Useful commands
1919

20-
* `npm run build` compile typescript to js
21-
* `npm run watch` watch for changes and compile
22-
* `npm run test` perform the jest unit tests
20+
* `yarn build` compile typescript to js
21+
* `yarn watch` watch for changes and compile
22+
* `yarn test` perform the jest unit tests
2323
* `cdk deploy` deploy this stack to your default AWS account/region
2424
* `cdk diff` compare deployed stack with current state
2525
* `cdk synth` emits the synthesized CloudFormation template

cdk/package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,5 +67,6 @@
6767
".eslintrc.js",
6868
"jest.config.js"
6969
]
70-
}
70+
},
71+
"packageManager": "yarn@4.12.0"
7172
}

0 commit comments

Comments
 (0)