Skip to content

Commit b9f251a

Browse files
committed
CI: Use setup-node pnpm cache in CI jobs; remove manual pnpm store cache in lint/site jobs
1 parent 405267f commit b9f251a

File tree

1 file changed

+8
-24
lines changed

1 file changed

+8
-24
lines changed

.github/workflows/test.yml

Lines changed: 8 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -25,24 +25,17 @@ jobs:
2525
uses: actions/setup-node@v4
2626
with:
2727
node-version: 20
28+
cache: pnpm
29+
cache-dependency-path: |
30+
pnpm-lock.yaml
31+
site/pnpm-lock.yaml
2832
2933
- name: Setup pnpm
3034
uses: pnpm/action-setup@v4
3135
with:
3236
version: latest
3337

34-
- name: Get pnpm store directory
35-
shell: bash
36-
run: |
37-
echo "STORE_PATH=$(pnpm store path --silent)" >> $GITHUB_ENV
38-
39-
- name: Setup pnpm cache
40-
uses: actions/cache@v4
41-
with:
42-
path: ${{ env.STORE_PATH }}
43-
key: ${{ runner.os }}-pnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }}
44-
restore-keys: |
45-
${{ runner.os }}-pnpm-store-
38+
# Using actions/setup-node pnpm cache; no manual pnpm store cache
4639

4740
- name: Install npm packages
4841
run: |
@@ -106,24 +99,15 @@ jobs:
10699
uses: actions/setup-node@v4
107100
with:
108101
node-version: 20
102+
cache: pnpm
103+
cache-dependency-path: site/pnpm-lock.yaml
109104

110105
- name: Setup pnpm
111106
uses: pnpm/action-setup@v4
112107
with:
113108
version: latest
114109

115-
- name: Get pnpm store directory
116-
shell: bash
117-
run: |
118-
echo "STORE_PATH=$(pnpm store path --silent)" >> $GITHUB_ENV
119-
120-
- name: Setup pnpm cache
121-
uses: actions/cache@v4
122-
with:
123-
path: ${{ env.STORE_PATH }}
124-
key: ${{ runner.os }}-pnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }}
125-
restore-keys: |
126-
${{ runner.os }}-pnpm-store-
110+
# Using actions/setup-node pnpm cache; no manual pnpm store cache
127111

128112
- name: Install site dependencies
129113
run: cd site && pnpm install --frozen-lockfile

0 commit comments

Comments
 (0)