Skip to content

Commit 4a473e2

Browse files
committed
Update ci
1 parent 830892f commit 4a473e2

File tree

3 files changed

+82
-14
lines changed

3 files changed

+82
-14
lines changed

.github/workflows/continuous-integration.yml

Lines changed: 32 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,24 @@ jobs:
1515
uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b # tag=v3
1616
- name: Add problem matcher
1717
run: echo "::add-matcher::.github/problemMatchers/eslint.json"
18-
- name: Use Node.js v16
19-
uses: actions/setup-node@2fddd8803e2f5c9604345a0b591c3020ee971a93 # tag=v3
18+
19+
- uses: actions/checkout@v2
20+
21+
- name: Find yarn cache location
22+
id: yarn-cache
23+
run: echo "::set-output name=dir::$(yarn cache dir)"
24+
25+
- name: JS package cache
26+
uses: actions/cache@v1
2027
with:
21-
node-version: 16
22-
cache: yarn --verbose
23-
registry-url: https://registry.npmjs.org/
28+
path: $(( steps.yarn-cache.outputs.dir ))
29+
key: $(( runner.os ))-yarn-$(( hashFiles('**/yarn.lock') ))
30+
restore-keys: |
31+
$(( runner.os ))-yarn-
32+
2433
- name: Install Dependencies
25-
run: yarn
34+
run: yarn install
35+
2636
- name: Run ESLint
2737
run: yarn lint --fix=false
2838

@@ -34,13 +44,23 @@ jobs:
3444
uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b # tag=v3
3545
- name: Add problem matcher
3646
run: echo "::add-matcher::.github/problemMatchers/tsc.json"
37-
- name: Use Node.js v16
38-
uses: actions/setup-node@eeb10cff27034e7acf239c5d29f62154018672fd # tag=v3
47+
48+
- uses: actions/checkout@v2
49+
50+
- name: Find yarn cache location
51+
id: yarn-cache
52+
run: echo "::set-output name=dir::$(yarn cache dir)"
53+
54+
- name: JS package cache
55+
uses: actions/cache@v1
3956
with:
40-
node-version: 16
41-
cache: yarn
42-
registry-url: https://registry.npmjs.org/
57+
path: $(( steps.yarn-cache.outputs.dir ))
58+
key: $(( runner.os ))-yarn-$(( hashFiles('**/yarn.lock') ))
59+
restore-keys: |
60+
$(( runner.os ))-yarn-
61+
4362
- name: Install Dependencies
44-
run: yarn --verbose
63+
run: yarn install
64+
4565
- name: Typecheck And Build Code
4666
run: yarn typecheck && yarn build-lib

.yarnrc.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
enableGlobalCache: true
2-
checksumBehavior: 'update'
32
nodeLinker: node-modules
43

54
plugins:

yarn.lock

Lines changed: 50 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -390,14 +390,30 @@ __metadata:
390390
languageName: node
391391
linkType: hard
392392

393+
"@types/nprogress@npm:^0.2.0":
394+
version: 0.2.0
395+
resolution: "@types/nprogress@npm:0.2.0"
396+
checksum: 561384775008ae58111f038f8f9468b3de8987cd753feef9bf6d07af0e1343390d492a078bb08a7b53ac7370208e31e06ac069cb852c435d49f5fe218e9769c4
397+
languageName: node
398+
linkType: hard
399+
393400
"@types/prop-types@npm:*":
394401
version: 15.7.5
395402
resolution: "@types/prop-types@npm:15.7.5"
396403
checksum: 5b43b8b15415e1f298243165f1d44390403bb2bd42e662bca3b5b5633fdd39c938e91b7fce3a9483699db0f7a715d08cef220c121f723a634972fdf596aec980
397404
languageName: node
398405
linkType: hard
399406

400-
"@types/react@npm:^18":
407+
"@types/react-dom@npm:^18":
408+
version: 18.0.11
409+
resolution: "@types/react-dom@npm:18.0.11"
410+
dependencies:
411+
"@types/react": "*"
412+
checksum: 579691e4d5ec09688087568037c35edf8cfb1ab3e07f6c60029280733ee7b5c06d66df6fcc90786702c93ac8cb13bc7ff16c79ddfc75d082938fbaa36e1cdbf4
413+
languageName: node
414+
linkType: hard
415+
416+
"@types/react@npm:*, @types/react@npm:^18":
401417
version: 18.0.28
402418
resolution: "@types/react@npm:18.0.28"
403419
dependencies:
@@ -2070,19 +2086,24 @@ __metadata:
20702086
resolution: "nextjs-toploader@workspace:."
20712087
dependencies:
20722088
"@types/node": ^18.14.6
2089+
"@types/nprogress": ^0.2.0
20732090
"@types/react": ^18
2091+
"@types/react-dom": ^18
20742092
"@typescript-eslint/eslint-plugin": ^5.54.0
20752093
"@typescript-eslint/parser": ^5.54.0
20762094
eslint: ^8.35.0
20772095
next: ^13.2.3
2096+
nprogress: ^0.2.0
20782097
prettier: ^2.8.4
20792098
prop-types: ^15.8.1
20802099
react: ^18.2.0
2100+
react-dom: ^18.2.0
20812101
tsup: ^6.6.3
20822102
typescript: ^4.9.5
20832103
peerDependencies:
20842104
next: ">= 6.0.0"
20852105
react: ">= 16.0.0"
2106+
react-dom: ">= 16.0.0"
20862107
languageName: unknown
20872108
linkType: soft
20882109

@@ -2145,6 +2166,13 @@ __metadata:
21452166
languageName: node
21462167
linkType: hard
21472168

2169+
"nprogress@npm:^0.2.0":
2170+
version: 0.2.0
2171+
resolution: "nprogress@npm:0.2.0"
2172+
checksum: 66b7bec5d563ecf2d1c3d2815e6d5eb74ed815eee8563e0afa63d3f185ab1b9cf2ddd97e1ded263b9995c5019d26d600320e849e50f3747984daa033744619dc
2173+
languageName: node
2174+
linkType: hard
2175+
21482176
"object-assign@npm:^4.0.1, object-assign@npm:^4.1.1":
21492177
version: 4.1.1
21502178
resolution: "object-assign@npm:4.1.1"
@@ -2356,6 +2384,18 @@ __metadata:
23562384
languageName: node
23572385
linkType: hard
23582386

2387+
"react-dom@npm:^18.2.0":
2388+
version: 18.2.0
2389+
resolution: "react-dom@npm:18.2.0"
2390+
dependencies:
2391+
loose-envify: ^1.1.0
2392+
scheduler: ^0.23.0
2393+
peerDependencies:
2394+
react: ^18.2.0
2395+
checksum: 7d323310bea3a91be2965f9468d552f201b1c27891e45ddc2d6b8f717680c95a75ae0bc1e3f5cf41472446a2589a75aed4483aee8169287909fcd59ad149e8cc
2396+
languageName: node
2397+
linkType: hard
2398+
23592399
"react-is@npm:^16.13.1":
23602400
version: 16.13.1
23612401
resolution: "react-is@npm:16.13.1"
@@ -2475,6 +2515,15 @@ __metadata:
24752515
languageName: node
24762516
linkType: hard
24772517

2518+
"scheduler@npm:^0.23.0":
2519+
version: 0.23.0
2520+
resolution: "scheduler@npm:0.23.0"
2521+
dependencies:
2522+
loose-envify: ^1.1.0
2523+
checksum: d79192eeaa12abef860c195ea45d37cbf2bbf5f66e3c4dcd16f54a7da53b17788a70d109ee3d3dde1a0fd50e6a8fc171f4300356c5aee4fc0171de526bf35f8a
2524+
languageName: node
2525+
linkType: hard
2526+
24782527
"semver@npm:^7.3.5, semver@npm:^7.3.7":
24792528
version: 7.3.8
24802529
resolution: "semver@npm:7.3.8"

0 commit comments

Comments
 (0)