From bc0bf00947c563652b674cab947f863c5c477dd2 Mon Sep 17 00:00:00 2001 From: Jan Klattenhoff Date: Wed, 9 Apr 2025 16:57:55 +0200 Subject: [PATCH] fix: Fix release pipeline --- .gitea/workflows/release.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitea/workflows/release.yml b/.gitea/workflows/release.yml index 0c4aa06..e1a90fb 100644 --- a/.gitea/workflows/release.yml +++ b/.gitea/workflows/release.yml @@ -60,15 +60,15 @@ jobs: git push origin HEAD:${{ env.RELEASE_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 - 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 }} - 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: | git remote set-url origin git@${{ env.GITEA_DOMAIN }}:${{ github.repository }}.git git push origin HEAD:${{ env.TARGET_BRANCH }} -- 2.47.2