Skip to content

Commit

Permalink
Use pnpm 9.1.1 (#6017)
Browse files Browse the repository at this point in the history
  • Loading branch information
sneridagh committed May 14, 2024
1 parent 96eb4fa commit 948857b
Show file tree
Hide file tree
Showing 9 changed files with 21,792 additions and 16,987 deletions.
31 changes: 17 additions & 14 deletions .github/workflows/acceptance.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
- uses: pnpm/action-setup@v3
name: Install pnpm
with:
version: 8
version: 9
# We don't want to install until later,
# when the cache and Cypress are in place
run_install: false
Expand Down Expand Up @@ -106,7 +106,7 @@ jobs:
- uses: pnpm/action-setup@v3
name: Install pnpm
with:
version: 8
version: 9
run_install: false

- name: Get pnpm store directory
Expand Down Expand Up @@ -188,7 +188,7 @@ jobs:
- uses: pnpm/action-setup@v3
name: Install pnpm
with:
version: 8
version: 9
run_install: false

- name: Get pnpm store directory
Expand Down Expand Up @@ -270,7 +270,7 @@ jobs:
- uses: pnpm/action-setup@v3
name: Install pnpm
with:
version: 8
version: 9
run_install: false

- name: Get pnpm store directory
Expand Down Expand Up @@ -352,7 +352,7 @@ jobs:
- uses: pnpm/action-setup@v3
name: Install pnpm
with:
version: 8
version: 9
run_install: false

- name: Get pnpm store directory
Expand Down Expand Up @@ -434,7 +434,7 @@ jobs:
- uses: pnpm/action-setup@v3
name: Install pnpm
with:
version: 8
version: 9
run_install: false

- name: Get pnpm store directory
Expand Down Expand Up @@ -515,7 +515,7 @@ jobs:
- uses: pnpm/action-setup@v3
name: Install pnpm
with:
version: 8
version: 9
run_install: false

- name: Get pnpm store directory
Expand Down Expand Up @@ -597,7 +597,7 @@ jobs:
- uses: pnpm/action-setup@v3
name: Install pnpm
with:
version: 8
version: 9
run_install: false

- name: Get pnpm store directory
Expand Down Expand Up @@ -679,7 +679,7 @@ jobs:
# - uses: pnpm/action-setup@v3
# name: Install pnpm
# with:
# version: 8
# version: 9
# run_install: false

# - name: Get pnpm store directory
Expand Down Expand Up @@ -750,7 +750,7 @@ jobs:
- uses: pnpm/action-setup@v3
name: Install pnpm
with:
version: 8
version: 9
run_install: false

- name: Get pnpm store directory
Expand Down Expand Up @@ -833,7 +833,7 @@ jobs:
- uses: pnpm/action-setup@v3
name: Install pnpm
with:
version: 8
version: 9
run_install: false

- name: Get pnpm store directory
Expand Down Expand Up @@ -943,7 +943,7 @@ jobs:
- uses: pnpm/action-setup@v3
name: Install pnpm
with:
version: 8
version: 9
run_install: false

- name: Get pnpm store directory
Expand All @@ -968,6 +968,9 @@ jobs:

- run: pnpm i

- name: Build dependencies
run: pnpm build:deps

- name: Install Cypress if not in cache
if: steps.cache-cypress-binary.outputs.cache-hit != 'true'
working-directory: packages/volto
Expand Down Expand Up @@ -1081,7 +1084,7 @@ jobs:
- uses: pnpm/action-setup@v3
name: Install pnpm
with:
version: 8
version: 9
run_install: false

- name: Get pnpm store directory
Expand Down Expand Up @@ -1165,7 +1168,7 @@ jobs:
- uses: pnpm/action-setup@v3
name: Install pnpm
with:
version: 8
version: 9
run_install: false

- name: Get pnpm store directory
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/code-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
- uses: pnpm/action-setup@v3
name: Install pnpm
with:
version: 8
version: 9
run_install: false

- name: Get pnpm store directory
Expand Down Expand Up @@ -58,7 +58,7 @@ jobs:
- uses: pnpm/action-setup@v3
name: Install pnpm
with:
version: 8
version: 9
run_install: false

- name: Get pnpm store directory
Expand Down Expand Up @@ -98,7 +98,7 @@ jobs:
- uses: pnpm/action-setup@v3
name: Install pnpm
with:
version: 8
version: 9
run_install: false

- name: Get pnpm store directory
Expand Down Expand Up @@ -138,7 +138,7 @@ jobs:
- uses: pnpm/action-setup@v3
name: Install pnpm
with:
version: 8
version: 9
run_install: false

- name: Get pnpm store directory
Expand Down
15 changes: 12 additions & 3 deletions .github/workflows/deployment_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
- uses: pnpm/action-setup@v3
name: Install pnpm
with:
version: 8
version: 9
# We don't want to install until later,
# when the cache and Cypress are in place
run_install: false
Expand All @@ -45,6 +45,9 @@ jobs:
- name: Install dependencies
run: pnpm install --frozen-lockfile

- name: Build dependencies
run: pnpm build:all

- name: Start backend
run: make start-backend-docker-detached

Expand Down Expand Up @@ -88,7 +91,7 @@ jobs:
- uses: pnpm/action-setup@v3
name: Install pnpm
with:
version: 8
version: 9
# We don't want to install until later,
# when the cache and Cypress are in place
run_install: false
Expand All @@ -109,6 +112,9 @@ jobs:
- name: Install dependencies
run: pnpm install --frozen-lockfile

- name: Build dependencies
run: pnpm build:all

- name: Start backend
run: make start-backend-docker-detached

Expand Down Expand Up @@ -152,7 +158,7 @@ jobs:
- uses: pnpm/action-setup@v3
name: Install pnpm
with:
version: 8
version: 9
# We don't want to install until later,
# when the cache and Cypress are in place
run_install: false
Expand All @@ -173,6 +179,9 @@ jobs:
- name: Install dependencies
run: pnpm install --frozen-lockfile

- name: Build dependencies
run: pnpm build:all

- name: Start backend
run: make start-backend-docker-detached

Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/unit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
- uses: pnpm/action-setup@v3
name: Install pnpm
with:
version: 8
version: 9
run_install: false

- name: Get pnpm store directory
Expand Down Expand Up @@ -75,7 +75,7 @@ jobs:
- uses: pnpm/action-setup@v3
name: Install pnpm
with:
version: 8
version: 9
run_install: false

- name: Get pnpm store directory
Expand Down Expand Up @@ -116,7 +116,7 @@ jobs:
- uses: pnpm/action-setup@v3
name: Install pnpm
with:
version: 8
version: 9
run_install: false

- name: Get pnpm store directory
Expand Down Expand Up @@ -151,7 +151,7 @@ jobs:
- uses: pnpm/action-setup@v3
name: Install pnpm
with:
version: 8
version: 9
run_install: false

- name: Get pnpm store directory
Expand Down Expand Up @@ -194,7 +194,7 @@ jobs:
- uses: pnpm/action-setup@v3
name: Install pnpm
with:
version: 8
version: 9
run_install: false

- name: Get pnpm store directory
Expand Down
3 changes: 1 addition & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,6 @@ clean:
setup:
# Setup ESlint for VSCode
node packages/scripts/vscodesettings.js
pnpm build:all

##### Documentation

Expand Down Expand Up @@ -401,4 +400,4 @@ stop-test-acceptance-server-detached: ## Stop Test Acceptance Server Main Fixtur

# include local overrides if present
-include Makefile.local
-include ../../../Makefile.local
-include ../../../Makefile.local
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
"typescript": "^5.4.5",
"vitest": "^1.5.0"
},
"packageManager": "pnpm@8.15.4",
"packageManager": "pnpm@9.1.1",
"pnpm": {
"overrides": {
"@pmmmwh/react-refresh-webpack-plugin": "0.5.11",
Expand Down
4 changes: 2 additions & 2 deletions packages/volto/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -147,8 +147,8 @@ full-test-acceptance-seamless: ## Runs Seamless Core Full Acceptance Testing in
######### Project Acceptance tests

.PHONY: start-test-acceptance-frontend-project
start-test-acceptance-frontend-project: build-deps ## Start the Project Acceptance Frontend Fixture
(cd ../../my-volto-app && RAZZLE_API_PATH=http://127.0.0.1:55001/plone pnpm build && pnpm start:prod)
start-test-acceptance-frontend-project: ## Start the Project Acceptance Frontend Fixture
(cd ../../my-volto-app && RAZZLE_API_PATH=http://127.0.0.1:55001/plone yarn build && yarn start:prod)

######### CoreSandbox Acceptance tests

Expand Down
2 changes: 2 additions & 0 deletions packages/volto/news/6017.bugfix
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Use `pnpm` 9.1.1 @sneridagh
Remove `postinstall` script for building dependencies @sneridagh

0 comments on commit 948857b

Please sign in to comment.