Skip to content

Commit

Permalink
Merge branch 'main' into release
Browse files Browse the repository at this point in the history
  • Loading branch information
acoffman committed Apr 6, 2022
2 parents 4a8b8c0 + bc2477b commit 8aed3fa
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 5 deletions.
10 changes: 6 additions & 4 deletions .github/workflows/docs.yml
Original file line number Diff line number Diff line change
@@ -1,13 +1,15 @@
name: Build and deploy docs
on:
push:
branches: [main]
on:
release:
types: [published]
jobs:
build-and-deploy:
runs-on: ubuntu-latest
steps:
- name: Checkout Code
uses: actions/[email protected]
with:
ref: release

- name: Build docs
run: |
Expand All @@ -18,4 +20,4 @@ jobs:
uses: JamesIves/[email protected]
with:
branch: gh-pages
folder: docs/build
folder: docs/build
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ jobs:
uses: griffithlab/civic-v2/.github/workflows/build_frontend.yml@main
with:
branch: release
deploy-staging:
deploy-production:
uses: griffithlab/civic-v2/.github/workflows/deploy.yml@main
needs: build-production
with:
Expand Down

0 comments on commit 8aed3fa

Please sign in to comment.