Skip to content

Commit 610b73f

Browse files
author
Aaron Waggener
committed
Use main branch for deploys. Rename workflow file to ci.yml
1 parent f376c25 commit 610b73f

File tree

2 files changed

+5
-39
lines changed

2 files changed

+5
-39
lines changed

.github/workflows/build.yml

Lines changed: 0 additions & 35 deletions
This file was deleted.

.github/workflows/deploy.yml renamed to .github/workflows/ci.yml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
1-
name: Deploy
1+
name: Build and Deploy
22

33
on:
4+
pull_request:
45
push:
56
branches:
67
- main
78

89
jobs:
9-
deploy:
10+
build_deploy:
1011
runs-on: ubuntu-latest
1112
steps:
1213
- name: Checkout
@@ -23,11 +24,11 @@ jobs:
2324
yarn test
2425
yarn build
2526
cp -r public/* dist
26-
27+
2728
- name: Deploy
29+
if: ${{ github.ref == 'refs/heads/main' }}
2830
uses: JamesIves/github-pages-deploy-action@4.1.5
2931
with:
3032
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
3133
BRANCH: gh-pages
3234
FOLDER: dist
33-
BUILD_SCRIPT: yarn install && yarn test && yarn build

0 commit comments

Comments
 (0)