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.

Sign up for GitHub

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

Jump to bottom

Fix CI on main branch #1126

Merged
merged 2 commits into from
Sep 20, 2023
Merged

Fix CI on main branch #1126

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7a867c2
Fix CI on main branch
garbas Sep 19, 2023
6d69ed0
Add comment about master->main change that still needs to happen
garbas Sep 19, 2023
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
8 changes: 5 additions & 3 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,8 @@ jobs:

- name: "Build"
run: |
nix develop --command "npm run build"
nix develop --command npm install
nix develop --command npm run build
mkdir build
cp -RL ./dist/* ./build/
cp -RL ./netlify.toml ./build/
Expand All @@ -68,8 +69,9 @@ jobs:
enable-commit-comment: false
enable-commit-status: true

production-branch: 'main'
production-deploy: ${{ github.event_name == 'push' && github.ref_name == 'main' }}
# TODO: once we make main branch default we should change master->main
production-branch: 'master'
production-deploy: ${{ github.event_name == 'push' && github.ref_name == 'master' }}

alias: ${{ github.event_name == 'push' && github.ref_name || '' }}

Expand Down