Skip to content

Commit

Permalink
use a specific pnpm version
Browse files Browse the repository at this point in the history
  • Loading branch information
anonrig committed Aug 19, 2024
1 parent 2561f1f commit 5f39d65
Show file tree
Hide file tree
Showing 5 changed files with 1,484 additions and 1,217 deletions.
6 changes: 4 additions & 2 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -174,9 +174,11 @@ jobs:
repository: cloudflare/workers-sdk

- name: Install pnpm
uses: pnpm/action-setup@v3
uses: pnpm/action-setup@v4
with:
version: ^9.1.3
# This version will be different depending on the value of `packageManager` field
# in package.json file with the setting in `.npmrc` file.
version: latest
- name: Use Node.js
uses: actions/setup-node@v4
with:
Expand Down
4 changes: 4 additions & 0 deletions .npmrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
# Ref: https://pnpm.io/npmrc#manage-package-manager-versions
# When enabled, pnpm will automatically download and run the version of pnpm
# specified in the packageManager field of package.json.
manage-package-manager-versions: true
3 changes: 2 additions & 1 deletion Dockerfile.release
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,8 @@ COPY . .
RUN echo "build:linux --action_env=CC=/usr/lib/llvm-16/bin/clang --action_env=CXX=/usr/lib/llvm-16/bin/clang++" >> .bazelrc
RUN echo "build:linux --host_action_env=CC=/usr/lib/llvm-16/bin/clang --host_action_env=CXX=/usr/lib/llvm-16/bin/clang++" >> .bazelrc
COPY .bazel-cache /bazel-disk-cache
RUN npm install -g pnpm@latest-7
# pnpm version will be different depending on the value of `packageManager` field in package.json
RUN npm install -g pnpm@latest
RUN pnpm install

RUN pnpm exec bazelisk build --disk_cache=/bazel-disk-cache --config=release_linux //src/workerd/server:workerd
Expand Down
3 changes: 2 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,5 +28,6 @@
"overrides": {
"capnpc-ts>typescript": "4.7.4"
}
}
},
"packageManager": "pnpm@9.7.1+sha512.faf344af2d6ca65c4c5c8c2224ea77a81a5e8859cbc4e06b1511ddce2f0151512431dd19e6aff31f2c6a8f5f2aced9bd2273e1fed7dd4de1868984059d2c4247"
}
Loading

0 comments on commit 5f39d65

Please # to comment.