Skip to content

Commit ac6978d

Browse files
authored
Merge pull request #307 from guardian/mc-update-yarn
Update yarn to latest stable version
2 parents f9ce013 + dde62df commit ac6978d

File tree

10 files changed

+19653
-162001
lines changed

10 files changed

+19653
-162001
lines changed

.github/workflows/ci.yml

+5-3
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
LAST_TEAMCITY_BUILD=650
2323
echo "BUILD_NUMBER=$(( $GITHUB_RUN_NUMBER + $LAST_TEAMCITY_BUILD ))" >> $GITHUB_ENV
2424
25-
- uses: actions/checkout@v3
25+
- uses: actions/checkout@v4
2626

2727
# Setup AWS credentials to enable uploading to S3 for Riff-Raff.
2828
# See https://github.com/aws-actions/configure-aws-credentials
@@ -31,16 +31,18 @@ jobs:
3131
role-to-assume: ${{ secrets.GU_RIFF_RAFF_ROLE_ARN }}
3232
aws-region: eu-west-1
3333

34+
- run: corepack enable
35+
3436
- name: Setup Node
35-
uses: actions/setup-node@v3
37+
uses: actions/setup-node@v4
3638
with:
3739
node-version-file: ".nvmrc"
3840

3941
- name: install dependencies
4042
run: yarn install
4143

4244
- name: check for duplicate dependencies (if it fails here, then pre-commit hook is not working)
43-
run: yarn yarn-deduplicate --fail
45+
run: yarn dedupe --check
4446

4547
- name: generate TS definitions for GraphQL schema
4648
run: yarn graphql-refresh

.gitignore

+9
Original file line numberDiff line numberDiff line change
@@ -13,3 +13,12 @@ cdk.out/
1313

1414
shared/graphql/graphql.ts
1515
.DS_Store
16+
17+
# See https://yarnpkg.com/getting-started/qa#which-files-should-be-gitignored
18+
.pnp.*
19+
.yarn/*
20+
!.yarn/patches
21+
!.yarn/plugins
22+
!.yarn/releases
23+
!.yarn/sdks
24+
!.yarn/versions

.husky/pre-commit

+2-1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33

44
set -e
55

6+
corepack enable
67
yarn lint-staged
78

89
if (git diff --name-only --cached | grep -e 'cdk' -e 'shared/graphql'); then
@@ -11,7 +12,7 @@ if (git diff --name-only --cached | grep -e 'cdk' -e 'shared/graphql'); then
1112
fi
1213

1314
if (git diff --name-only --cached | grep 'yarn.lock'); then
14-
yarn yarn-deduplicate
15+
yarn dedupe
1516
git add yarn.lock
1617
yarn workspace client analyze-main-client-bundle
1718
fi

.nvmrc

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
18.15.0
1+
18.20.2

0 commit comments

Comments
 (0)