Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/check-javascript-style.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
- name: Upgrade yarn
run: |
yarn set version berry
yarn set version 4
yarn set version $(node -p "require('./web/package.json').packageManager.split('@')[1]")

- name: Install Node modules
run: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/run-feature-tests-epas.yml
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@ jobs:
- name: Upgrade yarn
run: |
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
run: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/run-feature-tests-pg.yml
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,7 @@ jobs:
- name: Upgrade yarn
run: |
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
run: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/run-javascript-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ jobs:
- name: Upgrade yarn
run: |
yarn set version berry
yarn set version 4
yarn set version $(node -p "require('./web/package.json').packageManager.split('@')[1]")

- name: Install Node modules
run: |
Expand Down
16 changes: 12 additions & 4 deletions pkg/linux/build-functions.sh
Original file line number Diff line number Diff line change
Expand Up @@ -209,8 +209,12 @@ _build_runtime() {

# Install the runtime node_modules
pushd "${BUNDLEDIR}/resources/app" > /dev/null || exit
yarn set version berry
yarn set version 4
YARN_VERSION=$(node -p "require('./package.json').packageManager.split('@')[1]")
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}"
Comment thread
coderabbitai[bot] marked this conversation as resolved.
yarn workspaces focus --production

# remove the yarn cache
Expand Down Expand Up @@ -257,8 +261,12 @@ _copy_code() {
find "${SERVERROOT}/usr/${APP_NAME}/venv/" -name "_tkinter*" -print0 | xargs -0 rm -rf

pushd "${SOURCEDIR}/web" > /dev/null || exit
yarn set version berry
yarn set version 4
YARN_VERSION=$(node -p "require('./package.json').packageManager.split('@')[1]")
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 run bundle
popd > /dev/null || exit
Expand Down
2 changes: 1 addition & 1 deletion runtime/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"start": "electron .",
"linter": "yarn run eslint -c .eslintrc.js ."
},
"packageManager": "yarn@4.9.2",
"packageManager": "yarn@4.15.0",
"devDependencies": {
"@eslint/js": "^10.0.1",
"electron": "^42.3.3",
Expand Down
Loading