Skip to content

Commit 58e4bcb

Browse files
committed
chore: fix deploy script
1 parent 42e79e6 commit 58e4bcb

File tree

4 files changed

+36
-26
lines changed

4 files changed

+36
-26
lines changed

.github/actions/setup-deps/action.yml

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
name: Setup deps
2+
description: Setup Node.js and install dependencies
3+
4+
runs:
5+
using: composite
6+
steps:
7+
- name: Setup Node.js
8+
uses: actions/setup-node@v3
9+
with:
10+
node-version: 18
11+
12+
- name: Cache deps
13+
id: yarn-cache
14+
uses: actions/cache@v3
15+
with:
16+
path: ./node_modules
17+
key: ${{ runner.os }}-yarn-${{ hashFiles('./yarn.lock') }}
18+
19+
- name: Install deps
20+
if: steps.yarn-cache.outputs.cache-hit != 'true'
21+
run: yarn install --frozen-lockfile
22+
shell: bash

.github/actions/setup-node-deps/action.yml renamed to .github/actions/setup-website-deps/action.yml

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
name: Setup
2-
description: Setup Node.js and install dependencies
1+
name: Setup Website deps
2+
description: Setup Node.js and install website dependencies
33

44
runs:
55
using: composite
@@ -9,18 +9,6 @@ runs:
99
with:
1010
node-version: 18
1111

12-
- name: Cache deps
13-
id: yarn-cache
14-
uses: actions/cache@v3
15-
with:
16-
path: ./node_modules
17-
key: ${{ runner.os }}-yarn-${{ hashFiles('./yarn.lock') }}
18-
19-
- name: Install deps
20-
if: steps.yarn-cache.outputs.cache-hit != 'true'
21-
run: yarn install --frozen-lockfile
22-
shell: bash
23-
2412
- name: Cache website deps
2513
id: yarn-cache-website
2614
uses: actions/cache@v3

.github/workflows/deploy-website.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,11 @@ jobs:
1414
- name: Checkout
1515
uses: actions/checkout@v3
1616

17-
- name: Setup Node.js and deps
18-
uses: ./.github/actions/setup-node-deps
17+
- name: Setup Node.js and website deps
18+
uses: ./.github/actions/setup--website-deps
1919

2020
- name: Build website
21-
run: yarn build
21+
run: yarn --cwd website build
2222

2323
# Popular action to deploy to GitHub Pages:
2424
# Docs: https://github.com/peaceiris/actions-gh-pages#%EF%B8%8F-docusaurus
@@ -27,7 +27,7 @@ jobs:
2727
with:
2828
github_token: ${{ secrets.GITHUB_TOKEN }}
2929
# Build output to publish to the `gh-pages` branch:
30-
publish_dir: ./build
30+
publish_dir: ./website/build
3131
# The following lines assign commit authorship to the official
3232
# GH-Actions bot for deploys to `gh-pages` branch:
3333
# https://github.com/actions/checkout/issues/13#issuecomment-724415212

.github/workflows/main.yml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
uses: actions/checkout@v3
1515

1616
- name: Setup
17-
uses: ./.github/actions/setup-node-deps
17+
uses: ./.github/actions/setup-deps
1818

1919
lint:
2020
needs: [install-cached-deps]
@@ -25,7 +25,7 @@ jobs:
2525
uses: actions/checkout@v3
2626

2727
- name: Setup Node.js and deps
28-
uses: ./.github/actions/setup-node-deps
28+
uses: ./.github/actions/setup-deps
2929

3030
- name: Lint
3131
run: yarn lint
@@ -39,7 +39,7 @@ jobs:
3939
uses: actions/checkout@v3
4040

4141
- name: Setup Node.js and deps
42-
uses: ./.github/actions/setup-node-deps
42+
uses: ./.github/actions/setup-deps
4343

4444
- name: Typecheck
4545
run: yarn typecheck
@@ -53,7 +53,7 @@ jobs:
5353
uses: actions/checkout@v3
5454

5555
- name: Setup Node.js and deps
56-
uses: ./.github/actions/setup-node-deps
56+
uses: ./.github/actions/setup-deps
5757

5858
- name: Flow
5959
run: yarn flow
@@ -67,7 +67,7 @@ jobs:
6767
uses: actions/checkout@v3
6868

6969
- name: Setup Node.js and deps
70-
uses: ./.github/actions/setup-node-deps
70+
uses: ./.github/actions/setup-deps
7171

7272
- name: Test React 18
7373
run: yarn test:ci
@@ -84,7 +84,7 @@ jobs:
8484
uses: actions/checkout@v3
8585

8686
- name: Setup Node.js and deps
87-
uses: ./.github/actions/setup-node-deps
87+
uses: ./.github/actions/setup-deps
8888

8989
- name: Test React 17
9090
run: yarn test:ci:react:17
@@ -97,8 +97,8 @@ jobs:
9797
- name: Checkout
9898
uses: actions/checkout@v3
9999

100-
- name: Setup Node.js and deps
101-
uses: ./.github/actions/setup-node-deps
100+
- name: Setup Node.js and website deps
101+
uses: ./.github/actions/setup--website-deps
102102

103103
- name: Build website
104104
run: yarn --cwd website build

0 commit comments

Comments
 (0)