Skip to content

Commit

Permalink
Do not use minor version x when setting yarn version
Browse files Browse the repository at this point in the history
  • Loading branch information
adityatoshniwal committed Oct 26, 2023
1 parent f50f799 commit 8997f61
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 6 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/run-javascript-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:

- name: Upgrade yarn
run: |
yarn set version 3.x
yarn set version 3
- name: Install Node modules
run: |
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ WORKDIR /pgadmin4/web

# Build the JS vendor code in the app-builder, and then remove the vendor source.
RUN export CPPFLAGS="-DPNG_ARM_NEON_OPT=0" && \
yarn set version 3.x && \
yarn set version 3 && \
yarn install && \
yarn run bundle && \
rm -rf node_modules \
Expand Down
10 changes: 7 additions & 3 deletions web/.yarnrc.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
nodeLinker: node-modules
checksumBehavior: update

logFilters:
- code: YN0013
level: discard
- code: YN0013
level: discard

nodeLinker: node-modules

yarnPath: .yarn/releases/yarn-3.6.4.cjs
2 changes: 1 addition & 1 deletion web/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -182,5 +182,5 @@
"auditpy": "safety check --full-report -i 51668 -i 52495",
"audit": "yarn run auditjs && yarn run auditpy"
},
"packageManager": "yarn@3.5.0"
"packageManager": "yarn@3.6.4"
}

0 comments on commit 8997f61

Please sign in to comment.