Skip to content

Commit 2dc9c7d

Browse files
authored
removing custom cache keys (#322)
* removing custom cache keys * fixing order * not specifying version * readding step * readding step
1 parent e0da9b4 commit 2dc9c7d

File tree

1 file changed

+40
-60
lines changed

1 file changed

+40
-60
lines changed

.github/workflows/parallel-workflow-validate.yml

+40-60
Original file line numberDiff line numberDiff line change
@@ -14,55 +14,38 @@ jobs:
1414
install-dependencies:
1515
runs-on: ubuntu-latest
1616
timeout-minutes: 5
17-
outputs:
18-
cache-key: ${{ steps.set-cache-key.outputs.cache-key }}
1917
steps:
2018
- name: Checkout
2119
uses: actions/checkout@v4
2220

23-
- name: Set cache key
24-
id: set-cache-key
25-
run: echo "cache-key=${{ runner.os }}-pnpm-${{ hashFiles('**/pnpm-lock.yaml') }}" >> $GITHUB_OUTPUT
21+
- name: Install pnpm
22+
uses: pnpm/action-setup@v4
2623

2724
- name: Install Node.js
2825
uses: actions/setup-node@v4
2926
with:
3027
node-version-file: package.json
31-
32-
- name: Install pnpm
33-
uses: pnpm/action-setup@v4
34-
with:
35-
run_install: false
36-
37-
- name: Cache pnpm store
38-
id: cache
39-
uses: actions/cache@v4
40-
with:
41-
path: ~/.pnpm-store
42-
key: ${{ runner.os }}-pnpm-${{ hashFiles('**/pnpm-lock.yaml') }}
43-
restore-keys: |
44-
${{ runner.os }}-pnpm-
28+
cache: 'pnpm'
4529

4630
- name: Install dependencies
47-
run: pnpm install --frozen-lockfile
31+
run: pnpm install
4832

4933
typecheck:
5034
runs-on: ubuntu-latest
5135
needs: install-dependencies
5236
timeout-minutes: 5
5337
steps:
54-
- uses: actions/checkout@v4
55-
- uses: actions/setup-node@v4
38+
- name: Checkout
39+
uses: actions/checkout@v4
40+
- name: Install pnpm
41+
uses: pnpm/action-setup@v4
42+
- name: Install Node.js
43+
uses: actions/setup-node@v4
5644
with:
5745
node-version-file: package.json
58-
- uses: pnpm/action-setup@v4
59-
- uses: actions/cache@v4
60-
with:
61-
path: ~/.pnpm-store
62-
key: ${{ needs.install-dependencies.outputs.cache-key }}
63-
restore-keys: |
64-
${{ runner.os }}-pnpm-
65-
- run: pnpm install --frozen-lockfile
46+
cache: 'pnpm'
47+
- name: Install dependencies
48+
run: pnpm install
6649
- name: Run type checks
6750
run: pnpm run typecheck
6851

@@ -71,18 +54,17 @@ jobs:
7154
needs: install-dependencies
7255
timeout-minutes: 5
7356
steps:
74-
- uses: actions/checkout@v4
75-
- uses: actions/setup-node@v4
57+
- name: Checkout
58+
uses: actions/checkout@v4
59+
- name: Install pnpm
60+
uses: pnpm/action-setup@v4
61+
- name: Install Node.js
62+
uses: actions/setup-node@v4
7663
with:
7764
node-version-file: package.json
78-
- uses: pnpm/action-setup@v4
79-
- uses: actions/cache@v4
80-
with:
81-
path: ~/.pnpm-store
82-
key: ${{ needs.install-dependencies.outputs.cache-key }}
83-
restore-keys: |
84-
${{ runner.os }}-pnpm-
85-
- run: pnpm install --frozen-lockfile
65+
cache: 'pnpm'
66+
- name: Install dependencies
67+
run: pnpm install
8668
- name: Run lint
8769
run: pnpm run lint
8870
env:
@@ -118,18 +100,17 @@ jobs:
118100
VERCEL_TOKEN: ${{ secrets.VERCEL_TOKEN }}
119101
DATABASE_URL: postgres://postgres:[email protected]:5432/postgres
120102
steps:
121-
- uses: actions/checkout@v4
122-
- uses: actions/setup-node@v4
103+
- name: Checkout
104+
uses: actions/checkout@v4
105+
- name: Install pnpm
106+
uses: pnpm/action-setup@v4
107+
- name: Install Node.js
108+
uses: actions/setup-node@v4
123109
with:
124110
node-version-file: package.json
125-
- uses: pnpm/action-setup@v4
126-
- uses: actions/cache@v4
127-
with:
128-
path: ~/.pnpm-store
129-
key: ${{ needs.install-dependencies.outputs.cache-key }}
130-
restore-keys: |
131-
${{ runner.os }}-pnpm-
132-
- run: pnpm install --frozen-lockfile
111+
cache: 'pnpm'
112+
- name: Install dependencies
113+
run: pnpm install
133114
- name: Download environment variables
134115
run: |
135116
npm install --global vercel@latest
@@ -162,20 +143,19 @@ jobs:
162143
env:
163144
VERCEL_TOKEN: ${{ secrets.VERCEL_TOKEN }}
164145
steps:
165-
- uses: actions/checkout@v4
146+
- name: Checkout
147+
uses: actions/checkout@v4
166148
with:
167149
fetch-depth: 0 # Need more than 1 commit https://www.chromatic.com/docs/github-actions/
168-
- uses: actions/setup-node@v4
150+
- name: Install pnpm
151+
uses: pnpm/action-setup@v4
152+
- name: Install Node.js
153+
uses: actions/setup-node@v4
169154
with:
170155
node-version-file: package.json
171-
- uses: pnpm/action-setup@v4
172-
- uses: actions/cache@v4
173-
with:
174-
path: ~/.pnpm-store
175-
key: ${{ needs.install-dependencies.outputs.cache-key }}
176-
restore-keys: |
177-
${{ runner.os }}-pnpm-
178-
- run: pnpm install --frozen-lockfile
156+
cache: 'pnpm'
157+
- name: Install dependencies
158+
run: pnpm install
179159
- name: Download environment variables
180160
run: |
181161
npm install --global vercel@latest

0 commit comments

Comments
 (0)