Skip to content

Commit 9d2700e

Browse files
authored
Merge pull request #8 from launchql/fix/remove-corepack
Fix/remove corepack
2 parents b106c3a + c5a23db commit 9d2700e

4 files changed

Lines changed: 21 additions & 17 deletions

File tree

.github/workflows/ci.yml

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -78,12 +78,16 @@ jobs:
7878
- name: Checkout
7979
uses: actions/checkout@v4
8080

81-
- name: Enable corepack and pnpm
82-
run: |
83-
corepack enable
84-
corepack prepare pnpm@9 --activate
85-
pnpm -v
86-
node -v
81+
- name: Setup pnpm
82+
uses: pnpm/action-setup@v2
83+
with:
84+
version: 9
85+
86+
- name: Setup Node.js
87+
uses: actions/setup-node@v4
88+
with:
89+
node-version: '20'
90+
cache: 'pnpm'
8791

8892
- name: Install
8993
run: pnpm install
@@ -102,4 +106,3 @@ jobs:
102106
103107
- name: Test ${{ matrix.package }}
104108
run: cd ./packages/${{ matrix.package }} && pnpm test
105-

.github/workflows/integration-test.yml

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -52,12 +52,16 @@ jobs:
5252
- name: Checkout
5353
uses: actions/checkout@v4
5454

55-
- name: Enable corepack and pnpm
56-
run: |
57-
corepack enable
58-
corepack prepare pnpm@9 --activate
59-
pnpm -v
60-
node -v
55+
- name: Setup pnpm
56+
uses: pnpm/action-setup@v2
57+
with:
58+
version: 9
59+
60+
- name: Setup Node.js
61+
uses: actions/setup-node@v4
62+
with:
63+
node-version: '20'
64+
cache: 'pnpm'
6165

6266
- name: Install
6367
run: pnpm install
@@ -74,4 +78,3 @@ jobs:
7478
7579
- name: Run Integration Tests
7680
run: ./scripts/test-all-packages.js
77-

Dockerfile

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,7 @@ RUN set -eux; \
1414
apt-get update; \
1515
apt-get install -y --no-install-recommends ca-certificates curl git; \
1616
update-ca-certificates || true; \
17-
corepack enable; \
18-
corepack prepare pnpm@10.12.2 --activate; \
17+
npm install -g pnpm@10.12.2; \
1918
rm -rf /var/lib/apt/lists/*
2019

2120
# Copy workspace (build context is the repo root of pgpm-modules)

package.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
"publishConfig": {
1515
"access": "restricted"
1616
},
17-
"packageManager": "pnpm@10.12.2",
1817
"workspaces": [
1918
"packages/*"
2019
],

0 commit comments

Comments
 (0)