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

ci: explicitly configure main branch in env variable #1999

Merged
merged 1 commit into from
Nov 1, 2023
+4 −3
Merged

ci: explicitly configure main branch in env variable #1999

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 4 additions & 3 deletions .github/workflows/continuous-delivery.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ on:

env:
CI: true
MAIN_BRANCH: "main"

jobs:
install:
Expand Down Expand Up @@ -251,7 +252,7 @@ jobs:
uses: chromaui/action@v1
if: github.event.pull_request.draft == false
with:
autoAcceptChanges: main
autoAcceptChanges: ${{ env.MAIN_BRANCH }}
projectToken: ${{ secrets.CHROMATIC_PROJECT_TOKEN }}
storybookBuildDir: packages/storybook-css/dist/

Expand Down Expand Up @@ -279,7 +280,7 @@ jobs:
- name: Continuous Deployment to designsystem.utrecht.nl
uses: JamesIves/github-pages-deploy-action@v4.4.3
with:
branch: main
branch: $${ env.MAIN_BRANCH }}
folder: packages/design-system-website/dist/
repository-name: nl-design-system/designsystem.utrecht.nl
token: ${{ secrets.DOCS_GH_TOKEN }}
Expand Down Expand Up @@ -356,7 +357,7 @@ jobs:
GIT_COMMITTER_EMAIL: ${{ secrets.GIT_COMMITTER_EMAIL }}
GIT_COMMITTER_NAME: "NL Design System"
run: |
git push --set-upstream origin HEAD
git push --set-upstream "origin/${MAIN_BRANCH}" HEAD
pnpm run release

- name: "Continuous Deployment: publish to npm"
Expand Down
Loading