IntenseWebs/pgadmin4
3
0
Fork 0
mirror of https://github.com/pgadmin-org/pgadmin4.git synced 2026-08-17 16:34:44 -05:00
Code Issues Packages Projects Releases Wiki Activity

fix: pin Yarn version from packageManager field in build scripts (#10156)

Browse Source 
* fix: pin Yarn version from packageManager field in build scripts

Replace hardcoded 'yarn set version 4' in build-functions.sh with a
dynamic lookup from each workspace's package.json packageManager field.
Also syncs runtime yarn version to 4.15.0 to match web/package.json.

Fixes CI build failures caused by Yarn 4.x fetching a newer patch that
produces different builtin compat hashes, breaking --immutable lockfile
validation.
This commit is contained in:
Ashesh Vashi
2026-07-16 11:48:36 +05:30
committed by GitHub
parent dfc4ef37d0
commit b15c745dc1
6 changed files with 17 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.github/workflows/check-javascript-style.yml
+1 -1
View File
@@ -22,7 +22,7 @@ jobs:
- name: Upgrade yarn - name: Upgrade yarn
run: | run: |
yarn set version berry yarn set version berry
yarn set version 4 yarn set version $(node -p "require('./web/package.json').packageManager.split('@')[1]")
- name: Install Node modules - name: Install Node modules
run: | run: |
.github/workflows/run-feature-tests-epas.yml
+1 -1
View File
@@ -144,7 +144,7 @@ jobs:
- name: Upgrade yarn - name: Upgrade yarn
run: | run: |
yarn set version berry yarn set version berry
yarn set version 4 yarn set version $(node -p "require('./web/package.json').packageManager.split('@')[1]")
- name: Build the JS bundle - name: Build the JS bundle
run: | run: |
.github/workflows/run-feature-tests-pg.yml
+1 -1
View File
@@ -154,7 +154,7 @@ jobs:
- name: Upgrade yarn - name: Upgrade yarn
run: | run: |
yarn set version berry yarn set version berry
yarn set version 4 yarn set version $(node -p "require('./web/package.json').packageManager.split('@')[1]")
- name: Build the JS bundle - name: Build the JS bundle
run: | run: |
.github/workflows/run-javascript-tests.yml
+1 -1
View File
@@ -31,7 +31,7 @@ jobs:
- name: Upgrade yarn - name: Upgrade yarn
run: | run: |
yarn set version berry yarn set version berry
yarn set version 4 yarn set version $(node -p "require('./web/package.json').packageManager.split('@')[1]")
- name: Install Node modules - name: Install Node modules
run: | run: |
pkg/linux/build-functions.sh
+12 -4
View File
@@ -209,8 +209,12 @@ _build_runtime() {
# Install the runtime node_modules # Install the runtime node_modules
pushd "${BUNDLEDIR}/resources/app" > /dev/null || exit pushd "${BUNDLEDIR}/resources/app" > /dev/null || exit
yarn set version berry YARN_VERSION=$(node -p "require('./package.json').packageManager.split('@')[1]")
yarn set version 4 if [ -z "${YARN_VERSION}" ]; then
echo "ERROR: Could not determine Yarn version from package.json packageManager field."
exit 1
fi
yarn set version "${YARN_VERSION}"
yarn workspaces focus --production yarn workspaces focus --production
# remove the yarn cache # remove the yarn cache
@@ -257,8 +261,12 @@ _copy_code() {
find "${SERVERROOT}/usr/${APP_NAME}/venv/" -name "_tkinter*" -print0 | xargs -0 rm -rf find "${SERVERROOT}/usr/${APP_NAME}/venv/" -name "_tkinter*" -print0 | xargs -0 rm -rf
pushd "${SOURCEDIR}/web" > /dev/null || exit pushd "${SOURCEDIR}/web" > /dev/null || exit
yarn set version berry YARN_VERSION=$(node -p "require('./package.json').packageManager.split('@')[1]")
yarn set version 4 if [ -z "${YARN_VERSION}" ]; then
echo "ERROR: Could not determine Yarn version from package.json packageManager field."
exit 1
fi
yarn set version "${YARN_VERSION}"
yarn install yarn install
yarn run bundle yarn run bundle
popd > /dev/null || exit popd > /dev/null || exit
runtime/package.json
+1 -1
View File
@@ -10,7 +10,7 @@
"start": "electron .", "start": "electron .",
"linter": "yarn run eslint -c .eslintrc.js ." "linter": "yarn run eslint -c .eslintrc.js ."
}, },
"packageManager": "yarn@4.9.2", "packageManager": "yarn@4.15.0",
"devDependencies": { "devDependencies": {
"@eslint/js": "^10.0.1", "@eslint/js": "^10.0.1",
"electron": "^42.3.3", "electron": "^42.3.3",