Skip to content

Commit

Permalink
ci: fix action
Browse files Browse the repository at this point in the history
  • Loading branch information
DaniBodor committed Aug 5, 2024
1 parent 0c1879e commit d73c0c7
Showing 1 changed file with 4 additions and 3 deletions.
7 changes: 4 additions & 3 deletions .github/workflows/release_github.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:

steps:
- name: Fail if main branch was selected
if: ${{ github.ref_name }} == 'main'
if: ${{ github.ref_name == 'main' }}
run: |
echo "Cannot release from main branch, please select valid release branch."
exit 1
Expand All @@ -35,6 +35,7 @@ jobs:
with:
# token with admin priviliges to override brach protection on main and dev
token: ${{ secrets.GH_RELEASE }}
ref: main

- name: Configure git
run: |
Expand All @@ -45,8 +46,8 @@ jobs:
- name: Merge changes into main
run: |
git switch main
git merge ${{ github.ref_name }} --no-ff --no-commit
git merge --continue
git merge origin/${{ github.ref_name }} --no-ff --no-commit
git commit --no-edit
- name: Bump version
id: bump
Expand Down

0 comments on commit d73c0c7

Please sign in to comment.