Skip to content

ci: stop fetching an unpinned Yarn before the pinned one #10306

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
dpage wants to merge 1 commit into
base: master
Choose a base branch
from
Open

ci: stop fetching an unpinned Yarn before the pinned one #10306

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 5 additions & 4 deletions .github/workflows/check-javascript-style.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,11 @@ jobs:
steps:
- uses: actions/checkout@v4

- name: Upgrade yarn
run: |
yarn set version berry
yarn set version $(node -p "require('./web/package.json').packageManager.split('@')[1]")
# Corepack reads packageManager from web/package.json and provisions
# exactly that Yarn: a single pinned download, with nothing written
# into the checkout.
- name: Enable Corepack
run: corepack enable

- name: Install Node modules
run: |
Expand Down
9 changes: 5 additions & 4 deletions .github/workflows/run-feature-tests-epas.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,10 +141,11 @@ jobs:
}
EOF

- name: Upgrade yarn
run: |
yarn set version berry
yarn set version $(node -p "require('./web/package.json').packageManager.split('@')[1]")
# Corepack reads packageManager from web/package.json and provisions
# exactly that Yarn: a single pinned download, with nothing written
# into the checkout.
- name: Enable Corepack
run: corepack enable

- name: Build the JS bundle
run: |
Expand Down
9 changes: 5 additions & 4 deletions .github/workflows/run-feature-tests-pg.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,10 +151,11 @@ jobs:
}
EOF

- name: Upgrade yarn
run: |
yarn set version berry
yarn set version $(node -p "require('./web/package.json').packageManager.split('@')[1]")
# Corepack reads packageManager from web/package.json and provisions
# exactly that Yarn: a single pinned download, with nothing written
# into the checkout.
- name: Enable Corepack
run: corepack enable

- name: Build the JS bundle
run: |
Expand Down
9 changes: 5 additions & 4 deletions .github/workflows/run-javascript-tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,11 @@ jobs:

- uses: actions/checkout@v4

- name: Upgrade yarn
run: |
yarn set version berry
yarn set version $(node -p "require('./web/package.json').packageManager.split('@')[1]")
# Corepack reads packageManager from web/package.json and provisions
# exactly that Yarn: a single pinned download, with nothing written
# into the checkout.
- name: Enable Corepack
run: corepack enable

- name: Install Node modules
run: |
Expand Down
2 changes: 0 additions & 2 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,6 @@ RUN --mount=type=bind,source=.git,target=/pgadmin4/.git \
export CPPFLAGS="-DPNG_ARM_NEON_OPT=0" && \
npm install -g corepack && \
corepack enable && \
yarn set version berry && \
yarn set version "$(node -p "require('./package.json').packageManager.split('@')[1]")" && \
yarn install && \
yarn run bundle && \
rm -rf yarn.lock \
Expand Down
2 changes: 0 additions & 2 deletions Make.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -227,7 +227,6 @@ REM Main build sequence Ends
ECHO ERROR: Could not determine Yarn version from package.json packageManager field.
EXIT /B 1
)
CALL yarn set version berry || EXIT /B 1
CALL yarn set version %YARN_VERSION% || EXIT /B 1
CALL yarn install || EXIT /B 1
CALL npm rebuild || EXIT /B 1
Expand Down Expand Up @@ -288,7 +287,6 @@ REM Main build sequence Ends
ECHO ERROR: Could not determine Yarn version from package.json packageManager field.
EXIT /B 1
)
CALL yarn set version berry || EXIT /B 1
CALL yarn set version %YARN_VERSION% || EXIT /B 1
CALL yarn workspaces focus --production || EXIT /B 1

Expand Down
2 changes: 0 additions & 2 deletions pkg/mac/build-functions.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,6 @@ _build_runtime() {
echo "ERROR: Could not determine Yarn version from package.json packageManager field."
exit 1
fi
yarn set version berry
yarn set version "${YARN_VERSION}"
yarn workspaces focus --production

Expand Down Expand Up @@ -308,7 +307,6 @@ _complete_bundle() {
echo "ERROR: Could not determine Yarn version from package.json packageManager field."
exit 1
fi
yarn set version berry
yarn set version "${YARN_VERSION}"
yarn install 2>&1

Expand Down
1 change: 0 additions & 1 deletion pkg/pip/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,6 @@ if [ -z "${YARN_VERSION}" ]; then
echo "ERROR: Could not determine Yarn version from package.json packageManager field."
exit 1
fi
yarn set version berry
yarn set version "${YARN_VERSION}"
yarn install
yarn run bundle
Expand Down
Loading