Skip to content

Commit a4229bb

Browse files
committed
chore: use built in cache of actions/setup-node
1 parent 9f4f669 commit a4229bb

File tree

2 files changed

+18
-75
lines changed

2 files changed

+18
-75
lines changed

.github/workflows/lint.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,6 @@ jobs:
1818
steps:
1919
- uses: actions/checkout@v2
2020
- name: Danger
21-
uses: danger/[email protected].4
21+
uses: danger/[email protected].6
2222
env:
2323
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/nodejs.yml

Lines changed: 17 additions & 74 deletions
Original file line numberDiff line numberDiff line change
@@ -18,20 +18,11 @@ jobs:
1818
steps:
1919
- uses: actions/checkout@v2
2020

21-
- uses: actions/setup-node@v2.1.5
21+
- uses: actions/setup-node@v2.2.0
2222
with:
2323
node-version: 14.x
24+
cache: yarn
2425

25-
- name: Get yarn cache
26-
id: yarn-cache
27-
run: echo "::set-output name=dir::$(yarn config get cacheFolder)"
28-
29-
- uses: actions/[email protected]
30-
with:
31-
path: ${{ steps.yarn-cache.outputs.dir }}
32-
key: yarn2-${{ hashFiles('yarn.lock') }}
33-
restore-keys: |
34-
yarn2-
3526
- name: Validate cache
3627
env:
3728
# Use PnP and disable postinstall scripts as this just needs to
@@ -45,18 +36,10 @@ jobs:
4536
runs-on: ubuntu-latest
4637
steps:
4738
- uses: actions/checkout@v2
48-
- name: Get yarn cache
49-
id: yarn-cache
50-
run: echo "::set-output name=dir::$(yarn config get cacheFolder)"
51-
- uses: actions/cache@v2
52-
with:
53-
path: ${{ steps.yarn-cache.outputs.dir }}
54-
key: yarn2-${{ hashFiles('yarn.lock') }}
55-
restore-keys: |
56-
yarn2-
57-
- uses: actions/[email protected]
39+
- uses: actions/[email protected]
5840
with:
5941
node-version: 14.x
42+
cache: yarn
6043
- name: install
6144
run: yarn
6245
- name: run prettier
@@ -67,18 +50,10 @@ jobs:
6750
runs-on: ubuntu-latest
6851
steps:
6952
- uses: actions/checkout@v2
70-
- name: Get yarn cache
71-
id: yarn-cache
72-
run: echo "::set-output name=dir::$(yarn config get cacheFolder)"
73-
- uses: actions/cache@v2
74-
with:
75-
path: ${{ steps.yarn-cache.outputs.dir }}
76-
key: yarn2-${{ hashFiles('yarn.lock') }}
77-
restore-keys: |
78-
yarn2-
79-
- uses: actions/[email protected]
53+
- uses: actions/[email protected]
8054
with:
8155
node-version: 14.x
56+
cache: yarn
8257
- name: install
8358
run: yarn
8459
- name: run typecheck
@@ -87,7 +62,7 @@ jobs:
8762
test-node:
8863
name:
8964
# prettier-ignore
90-
Test on Node.js v${{ matrix.node-version }} and eslint v${{matrix.eslint-version }}
65+
Test on Node.js v${{ matrix.node-version }} and eslint v${{ matrix.eslint-version }}
9166
needs: prepare-yarn-cache
9267
strategy:
9368
fail-fast: false
@@ -98,23 +73,15 @@ jobs:
9873

9974
steps:
10075
- uses: actions/checkout@v2
101-
- name: Get yarn cache
102-
id: yarn-cache
103-
run: echo "::set-output name=dir::$(yarn config get cacheFolder)"
104-
- uses: actions/cache@v2
105-
with:
106-
path: ${{ steps.yarn-cache.outputs.dir }}
107-
key: yarn2-${{ hashFiles('yarn.lock') }}
108-
restore-keys: |
109-
yarn2-
11076
- name: Use Node.js ${{ matrix.node-version }}
111-
uses: actions/setup-node@v2.1.5
77+
uses: actions/setup-node@v2.2.0
11278
with:
11379
node-version: ${{ matrix.node-version }}
114-
- name: install with eslint v${{matrix.eslint-version }}
80+
cache: yarn
81+
- name: install with eslint v${{ matrix.eslint-version }}
11582
run: |
11683
yarn
117-
yarn add --dev eslint@${{matrix.eslint-version }}
84+
yarn add --dev eslint@${{ matrix.eslint-version }}
11885
- name: run tests
11986
# only collect coverage on eslint versions that support the suggestions api
12087
run: yarn test --coverage ${{ matrix.eslint-version >= 6 }}
@@ -133,18 +100,10 @@ jobs:
133100

134101
steps:
135102
- uses: actions/checkout@v2
136-
- name: Get yarn cache
137-
id: yarn-cache
138-
run: echo "::set-output name=dir::$(yarn config get cacheFolder)"
139-
- uses: actions/cache@v2
140-
with:
141-
path: ${{ steps.yarn-cache.outputs.dir }}
142-
key: yarn2-${{ hashFiles('yarn.lock') }}
143-
restore-keys: |
144-
yarn2-
145-
- uses: actions/[email protected]
103+
- uses: actions/[email protected]
146104
with:
147105
node-version: 14.x
106+
cache: yarn
148107
- name: install
149108
run: yarn
150109
- name: run tests
@@ -158,18 +117,10 @@ jobs:
158117
runs-on: ubuntu-latest
159118
steps:
160119
- uses: actions/checkout@v2
161-
- name: Get yarn cache
162-
id: yarn-cache
163-
run: echo "::set-output name=dir::$(yarn config get cacheFolder)"
164-
- uses: actions/cache@v2
165-
with:
166-
path: ${{ steps.yarn-cache.outputs.dir }}
167-
key: yarn2-${{ hashFiles('yarn.lock') }}
168-
restore-keys: |
169-
yarn2-
170-
- uses: actions/[email protected]
120+
- uses: actions/[email protected]
171121
with:
172122
node-version: 14.x
123+
cache: yarn
173124
- name: install
174125
run: yarn
175126
- name: regenerate docs
@@ -189,18 +140,10 @@ jobs:
189140
runs-on: ubuntu-latest
190141
steps:
191142
- uses: actions/checkout@v2
192-
- name: Get yarn cache
193-
id: yarn-cache
194-
run: echo "::set-output name=dir::$(yarn config get cacheFolder)"
195-
- uses: actions/cache@v2
196-
with:
197-
path: ${{ steps.yarn-cache.outputs.dir }}
198-
key: yarn2-${{ hashFiles('yarn.lock') }}
199-
restore-keys: |
200-
yarn2-
201-
- uses: actions/[email protected]
143+
- uses: actions/[email protected]
202144
with:
203145
node-version: 14.x
146+
cache: yarn
204147
- name: install
205148
run: yarn
206149
- run: yarn semantic-release

0 commit comments

Comments
 (0)