fix: Fix release pipeline #3

Merged
jank merged 1 commit from main into release 2025-04-09 14:58:13 +00:00

View file

@ -60,15 +60,15 @@ jobs:
git push origin HEAD:${{ env.RELEASE_BRANCH }} git push origin HEAD:${{ env.RELEASE_BRANCH }}
- name: Checkout target branch - name: Checkout target branch
if: ${{ steps.semantic.outputs.new_release_published && !env.SKIP_MERGE }} if: ${{ steps.semantic.outputs.new_release_published && !(env.SKIP_MERGE == true) }}
run: git reset --hard && git checkout ${{ env.TARGET_BRANCH }} && git pull run: git reset --hard && git checkout ${{ env.TARGET_BRANCH }} && git pull
- name: Merge release - name: Merge release
if: ${{ steps.semantic.outputs.new_release_published && !env.SKIP_MERGE }} if: ${{ steps.semantic.outputs.new_release_published && !(env.SKIP_MERGE == true) }}
run: git merge ${{ env.RELEASE_BRANCH }} run: git merge ${{ env.RELEASE_BRANCH }}
- name: Push changes to target branch - name: Push changes to target branch
if: ${{ steps.semantic.outputs.new_release_published && !env.SKIP_MERGE }} if: ${{ steps.semantic.outputs.new_release_published && !(env.SKIP_MERGE == true) }}
run: | run: |
git remote set-url origin git@${{ env.GITEA_DOMAIN }}:${{ github.repository }}.git git remote set-url origin git@${{ env.GITEA_DOMAIN }}:${{ github.repository }}.git
git push origin HEAD:${{ env.TARGET_BRANCH }} git push origin HEAD:${{ env.TARGET_BRANCH }}