Skip to content

Commit ea354fc

Browse files
committed
main.yml fix
1 parent 6c0818f commit ea354fc

File tree

1 file changed

+12
-46
lines changed

1 file changed

+12
-46
lines changed

.github/workflows/main.yml

Lines changed: 12 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -20,26 +20,13 @@ jobs:
2020
- uses: actions/setup-node@v6
2121
with:
2222
node-version: 24
23-
cache: npm
23+
cache: pnpm
24+
cache-dependency-path: pnpm-lock.yaml
2425
- name: Install pnpm
2526
uses: pnpm/action-setup@v4
2627
id: pnpm-install
2728
with:
2829
run_install: false
29-
- name: Get pnpm store directory
30-
id: pnpm-cache
31-
shell: bash
32-
run: |
33-
echo "STORE_PATH=$(pnpm store path)" >> $GITHUB_OUTPUT
34-
35-
- uses: actions/cache@v4
36-
name: Setup pnpm cache
37-
with:
38-
path: ${{ steps.pnpm-cache.outputs.STORE_PATH }}
39-
key: ${{ runner.os }}-pnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }}
40-
restore-keys: |
41-
${{ runner.os }}-pnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }}
42-
${{ runner.os }}-pnpm-store-
4330

4431
- uses: actions/cache@v4
4532
name: Retrieve Cache
@@ -69,39 +56,14 @@ jobs:
6956
- uses: actions/setup-node@v6
7057
with:
7158
node-version: ${{ matrix.node-version }}
72-
cache: npm
59+
cache: pnpm
60+
cache-dependency-path: pnpm-lock.yaml
7361

7462
- name: Install pnpm
7563
uses: pnpm/action-setup@v4
7664
id: pnpm-install
7765
with:
7866
run_install: false
79-
- name: Get pnpm store directory
80-
id: pnpm-cache
81-
shell: bash
82-
run: |
83-
echo "STORE_PATH=$(pnpm store path)" >> $GITHUB_OUTPUT
84-
85-
- uses: actions/cache@v4
86-
name: Setup pnpm cache
87-
with:
88-
path: ${{ steps.pnpm-cache.outputs.STORE_PATH }}
89-
key: ${{ runner.os }}-pnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }}
90-
restore-keys: |
91-
${{ runner.os }}-pnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }}
92-
${{ runner.os }}-pnpm-store-
93-
94-
- uses: actions/cache@v4
95-
name: Retrieve Cache
96-
with:
97-
path: |
98-
node_modules/.cache
99-
node_modules/.vitest
100-
key: ${{ runner.os }}-build-${{ hashFiles('**/pnpm-lock.yaml') }}
101-
restore-keys: |
102-
${{ runner.os }}-build-${{ hashFiles('**/pnpm-lock.yaml') }}
103-
${{ runner.os }}-build-
104-
${{ runner.os }}-
10567
- run: pnpm test:all
10668

10769
publish:
@@ -119,10 +81,14 @@ jobs:
11981
- uses: actions/setup-node@v4
12082
with:
12183
node-version: 24
122-
cache: npm
84+
cache: pnpm
12385
registry-url: 'https://registry.npmjs.org'
124-
125-
- run: npm ci
86+
- name: Install pnpm
87+
uses: pnpm/action-setup@v4
88+
id: pnpm-install
89+
with:
90+
run_install: false
91+
- run: pnpm install
12692

12793
- name: Determine npm tag
12894
id: npm-tag
@@ -145,6 +111,6 @@ jobs:
145111
echo "tag=" >> $GITHUB_OUTPUT
146112
fi
147113
148-
- run: npm publish --provenance --access public ${{ steps.npm-tag.outputs.tag }}
114+
- run: pnpm publish --provenance --access public ${{ steps.npm-tag.outputs.tag }}
149115
env:
150116
NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}

0 commit comments

Comments
 (0)