Skip to content

Commit

Permalink
Merge branch 'main' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
spjuhel authored Apr 23, 2024
2 parents 0aabd63 + 051cd04 commit 1726a61
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 1 deletion.
14 changes: 14 additions & 0 deletions .github/pull_request_template.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
Changes proposed in this PR:
-
-

This PR fixes #

### PR Author Checklist

- [ ] If new release, is version bumped?
- [ ] Correct target branch selected (if unsure, select `develop`)
- [ ] Descriptive pull request title added
- [ ] Source branch up-to-date with target branch
- [ ] Documentation updated
- [ ] Tests passing
3 changes: 2 additions & 1 deletion .github/workflows/static_html_deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ name: Build and deploy static content to Pages
on:
# Runs on pushes targeting the default branch
push:
branches: ["main"]
branches: ["main", "develop"]

# Allows you to run this workflow manually from the Actions tab
workflow_dispatch:
Expand All @@ -24,6 +24,7 @@ jobs:
# Single deploy job since we're just deploying
build:
runs-on: ubuntu-latest
environment: github-pages
steps:
- uses: actions/checkout@v4
with:
Expand Down

0 comments on commit 1726a61

Please sign in to comment.