Skip to content

Commit

Permalink
chore: updating pnpm version to unblock netlify build (#7687)
Browse files Browse the repository at this point in the history
  • Loading branch information
mmaietta authored Jul 25, 2023
1 parent 9ad852a commit e641ec9
Show file tree
Hide file tree
Showing 8 changed files with 2,093 additions and 1,921 deletions.
2 changes: 1 addition & 1 deletion .github/actions/pnpm/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ inputs:
version: # id of input
description: 'The pnpm version to use'
required: false
default: 7.13.2
default: 8.6.10

runs:
using: 'composite'
Expand Down
2 changes: 1 addition & 1 deletion .github/actions/pretest/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ inputs:
version:
description: 'The pnpm version to use'
required: false
default: 7.13.2
default: 8.6.10

runs:
using: 'composite'
Expand Down
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ This repository has a mono-repo structure consisting of multiple packages. Try t
electron-builder for your other projects to leverage and test with.

```
npm i -g pnpm@latest-7
npm i -g pnpm@latest-8
pnpm i yalc -g
```

Expand Down
6 changes: 3 additions & 3 deletions docker/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -9,21 +9,21 @@ docker build -t electronuserland/builder:base -t "electronuserland/builder:base-
## NOTE: Order the latest to oldest versions. The most recent node LTS should be tagged as the latest image

# Node 18
docker build --build-arg NODE_VERSION=18.15.0 -t electronuserland/builder:18 -t "electronuserland/builder:18-$DATE" -t electronuserland/builder:latest docker/node
docker build --build-arg NODE_VERSION=18.16.1 -t electronuserland/builder:18 -t "electronuserland/builder:18-$DATE" -t electronuserland/builder:latest docker/node

docker build --build-arg IMAGE_VERSION=18 -t electronuserland/builder:18-wine -t "electronuserland/builder:18-wine-$DATE" -t electronuserland/builder:wine docker/wine
docker build --build-arg IMAGE_VERSION=18-wine -t electronuserland/builder:18-wine-mono -t "electronuserland/builder:18-wine-mono-$DATE" -t electronuserland/builder:wine-mono docker/wine-mono
docker build --build-arg IMAGE_VERSION=18-wine -t electronuserland/builder:18-wine-chrome -t "electronuserland/builder:18-wine-chrome-$DATE" -t electronuserland/builder:wine-chrome docker/wine-chrome

# Node 16
docker build --build-arg NODE_VERSION=16.17.1 -t electronuserland/builder:16 -t "electronuserland/builder:16-$DATE" docker/node
docker build --build-arg NODE_VERSION=16.20.0 -t electronuserland/builder:16 -t "electronuserland/builder:16-$DATE" docker/node

docker build --build-arg IMAGE_VERSION=16 -t electronuserland/builder:16-wine -t "electronuserland/builder:16-wine-$DATE" docker/wine
docker build --build-arg IMAGE_VERSION=16-wine -t electronuserland/builder:16-wine-mono -t "electronuserland/builder:16-wine-mono-$DATE" docker/wine-mono
docker build --build-arg IMAGE_VERSION=16-wine -t electronuserland/builder:16-wine-chrome -t "electronuserland/builder:16-wine-chrome-$DATE" docker/wine-chrome

# Node 14
docker build --build-arg NODE_VERSION=14.19.3 -t electronuserland/builder:14 -t "electronuserland/builder:14-$DATE" docker/node
docker build --build-arg NODE_VERSION=14.21.3 -t electronuserland/builder:14 -t "electronuserland/builder:14-$DATE" docker/node

docker build --build-arg IMAGE_VERSION=14 -t electronuserland/builder:14-wine -t "electronuserland/builder:14-wine-$DATE" docker/wine
docker build --build-arg IMAGE_VERSION=14-wine -t electronuserland/builder:14-wine-mono -t "electronuserland/builder:14-wine-mono-$DATE" docker/wine-mono
Expand Down
2 changes: 1 addition & 1 deletion docker/node/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,4 @@ RUN curl -L https://nodejs.org/dist/v$NODE_VERSION/node-v$NODE_VERSION-linux-x64
unlink /usr/local/CHANGELOG.md && unlink /usr/local/LICENSE && unlink /usr/local/README.md && \
# https://github.com/npm/npm/issues/4531
echo "unsafe-perm true" > .npmrc
RUN npm i -g pnpm@7.13.2
RUN npm i -g pnpm@8.6.10
2 changes: 1 addition & 1 deletion netlify-docs.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
pip3 install pipenv
pipenv install
echo "Installing pnpm"
npm i -g pnpm@latest-7
npm i -g pnpm@latest-8
pnpm install --store=./node_modules/.pnpm-store
echo "Building site docs"
mkdocs build
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@
},
"engines": {
"node": ">=14.14",
"pnpm": ">=7.4.0"
"pnpm": ">=8.0.0"
},
"pnpm": {
"patchedDependencies": {
Expand Down
Loading

0 comments on commit e641ec9

Please sign in to comment.