Skip to content

Commit

Permalink
Reapply "chore(infra): Upgrade helm build yarn (#16890)" (#16967)
Browse files Browse the repository at this point in the history
This reverts commit 0885426.
  • Loading branch information
AndesKrrrrrrrrrrr committed Nov 20, 2024
1 parent 0885426 commit 8b0cf00
Show file tree
Hide file tree
Showing 4 changed files with 22 additions and 4 deletions.
10 changes: 9 additions & 1 deletion infra/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,12 @@
"name": "infra",
"version": "1.0.0",
"main": "index.js",
"engines": {
"npm": "please-use-yarn",
"node": "20.15.0",
"yarn": "3.2"
},
"packageManager": "yarn@3.2.3",
"scripts": {
"test": "jest",
"charts": "node -r esbuild-register src/cli/generate-chart-values.ts",
Expand All @@ -27,6 +33,7 @@
"dependencies": {
"@aws-sdk/client-ssm": "3.145.0",
"@types/lodash": "4.14.160",
"@types/yargs": "17.0.33",
"aws-sdk": "^2.1003.0",
"glob": "10.3.3",
"json-refs": "3.0.15",
Expand All @@ -36,6 +43,7 @@
"yargs": "17.7.2"
},
"volta": {
"node": "18.12.1"
"node": "20.15.0",
"yarn": "3.2.3"
}
}
2 changes: 1 addition & 1 deletion infra/scripts/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ ENV NODE_OPTIONS=--openssl-legacy-provider

COPY infra/package.json infra/yarn.lock /app/infra/
COPY .yarn/ ./.yarn
RUN yarn install --immutable
RUN ls -lah && id && pwd && cat package.json && corepack enable && yarn install --immutable

COPY infra/ /app/infra/
COPY apps /app/apps/
Expand Down
10 changes: 10 additions & 0 deletions infra/yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -3808,6 +3808,15 @@ __metadata:
languageName: node
linkType: hard

"@types/yargs@npm:17.0.33":
version: 17.0.33
resolution: "@types/yargs@npm:17.0.33"
dependencies:
"@types/yargs-parser": "*"
checksum: ee013f257472ab643cb0584cf3e1ff9b0c44bca1c9ba662395300a7f1a6c55fa9d41bd40ddff42d99f5d95febb3907c9ff600fbcb92dadbec22c6a76de7e1236
languageName: node
linkType: hard

"@types/yargs@npm:^15.0.0":
version: 15.0.11
resolution: "@types/yargs@npm:15.0.11"
Expand Down Expand Up @@ -6681,6 +6690,7 @@ __metadata:
"@types/js-yaml": 3.12.5
"@types/lodash": 4.14.160
"@types/node": 14.14.14
"@types/yargs": 17.0.33
"@zeit/ncc": 0.22.3
aws-sdk: ^2.1003.0
esbuild: 0.14.39
Expand Down
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
"node": "20.15.0",
"yarn": "3.2"
},
"packageManager": "yarn@3.2.3",
"repository": {
"type": "git",
"url": "https://github.com/island-is/island.is.git"
Expand Down Expand Up @@ -505,6 +506,5 @@
"volta": {
"node": "20.15.0",
"yarn": "3.2.3"
},
"packageManager": "yarn@3.2.3"
}
}

0 comments on commit 8b0cf00

Please sign in to comment.