Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Accommodate rapid website development on the website branch #287

Merged
merged 7 commits into from
Oct 11, 2022
Merged
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/deploy-website.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: Update `error-prone.picnic.tech` website content
on:
pull_request:
push:
branches: [ master, website ]
branches: [ website ]
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

IIUC, if we wish to run the build job still on master, it should be added to the branches here. This will not overwrite the website as the deploy job does not run on master.

Suggested change
branches: [ website ]
branches: [ master, website ]

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah that would be nice actually, warns us whenever there is an error there. As long as it doesn't override the website for every new merge :).

permissions:
contents: read
id-token: write
Expand Down Expand Up @@ -35,7 +35,7 @@ jobs:
with:
path: ./website/_site
deploy:
if: github.ref == 'refs/heads/master' || github.ref == 'refs/heads/website'
if: github.ref == 'refs/heads/website'
needs: build
runs-on: ubuntu-22.04
environment:
Expand Down