Skip to content

Commit 2e77f09

Browse files
committed
fix: install pnpm and run pnpm install in Docker to set up workspace properly
- Add pnpm installation to Dockerfile - Run pnpm install to properly set up workspace dependencies - This ensures workspace packages are correctly linked in the container
1 parent 6c328c8 commit 2e77f09

File tree

4 files changed

+13
-86
lines changed

4 files changed

+13
-86
lines changed

.github/workflows/ci.yml

Lines changed: 0 additions & 78 deletions
This file was deleted.

.github/workflows/lint.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,13 +27,13 @@ jobs:
2727
uses: actions/checkout@v5
2828

2929
# We restore the code/deps from cache if triggered from workflow_call (i.e. have valid cache key)
30-
- if: inputs.dep-cache-key != 'none'
30+
- if: inputs.dep-cache-key != 'none'
3131
uses: actions/cache/restore@v4
3232
id: dep-cache
3333
with:
3434
path: ${{github.workspace}}
3535
key: ${{ inputs.dep-cache-key }}
36-
36+
3737
- uses: pnpm/action-setup@v4
3838
with:
3939
version: 10.5.2
@@ -49,7 +49,7 @@ jobs:
4949
if: steps.dep-cache.outputs.cache-hit != 'true'
5050
run: pnpm install --frozen-lockfile
5151
working-directory: ${{ github.workspace }}
52-
53-
52+
53+
5454
- run: pnpm run lint
5555
working-directory: ${{ github.workspace }}

.github/workflows/typecheck.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,13 +30,13 @@ jobs:
3030
uses: actions/checkout@v5
3131

3232
# We restore the code/deps from cache if triggered from workflow_call (i.e. have valid cache key)
33-
- if: inputs.dep-cache-key != 'none'
33+
- if: inputs.dep-cache-key != 'none'
3434
uses: actions/cache/restore@v4
3535
id: dep-cache
3636
with:
3737
path: ${{github.workspace}}
3838
key: ${{ inputs.dep-cache-key }}
39-
39+
4040
- uses: pnpm/action-setup@v4
4141
with:
4242
version: 10.5.2
@@ -61,7 +61,7 @@ jobs:
6161
path: ${{github.workspace}}/packages/ethereum-tests
6262
key: ${{ inputs.submodule-cache-key}}
6363
fail-on-cache-miss: true
64-
65-
64+
65+
6666
- run: pnpm -r run tsc
6767
working-directory: ${{ github.workspace }}

Dockerfile

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
FROM node:22.4-slim
22
RUN apt-get update && apt-get install -y git g++ make python3 python3-setuptools && apt-get clean && rm -rf /var/lib/apt/lists/*
33

4+
# Install pnpm
5+
RUN npm install -g [email protected]
6+
47
WORKDIR /ethereumjs-monorepo
58

69
COPY .git .git
@@ -49,6 +52,8 @@ COPY packages/verkle/package.json packages/verkle/package.json
4952
COPY packages/vm/package.json packages/vm/package.json
5053
COPY packages/wallet/package.json packages/wallet/package.json
5154

55+
# Install dependencies to set up workspace properly
56+
RUN pnpm install --frozen-lockfile
5257

5358
# Sanity check
5459
RUN node /ethereumjs-monorepo/packages/client/dist/esm/bin/cli.js --help

0 commit comments

Comments
 (0)