From df195282e840b55df56121b5200b88cd7fdb58b2 Mon Sep 17 00:00:00 2001
From: Tal Borenstein <tal@keephq.dev>
Date: Mon, 12 Aug 2024 11:45:12 +0300
Subject: [PATCH] fix: release

---
 .github/workflows/release.yml | 22 +++++++---------------
 1 file changed, 7 insertions(+), 15 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 997b117b7d..4d85eda99c 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -18,33 +18,25 @@ jobs:
           fetch-depth: 0
           persist-credentials: false
 
-      - name: Create or update release branch
-        run: |
-          git config user.name "Keep Release Bot"
-          git config user.email "no-reply@keephq.dev"
-
-          # Fetch all branches and tags
-          git fetch --all
-
-          # Create or reset the release branch to match the current HEAD
-          git checkout -B release
-
       - name: Release Keep
+        id: release-step
         uses: python-semantic-release/python-semantic-release@v9.4.0
         with:
           git_committer_name: Keep Release Bot
           git_committer_email: no-reply@keephq.dev
           github_token: ${{ secrets.GITHUB_TOKEN }}
 
-      - name: Push branch
+      - name: Create or update release branch
         run: |
-          # Push the release branch to the remote repository, forcing update
-          git push --force origin release
+          git config user.name "Keep Release Bot"
+          git config user.email "no-reply@keephq.dev"
+
+          # Create or reset the release branch to match the current HEAD
+          git checkout -B release/${{ steps.release-step.outputs.version }}
 
       - name: Open PR for release branch
         uses: peter-evans/create-pull-request@v5
         with:
-          branch: release
           title: "Release - $(date +'%Y-%m-%d')"
           body: "This PR contains the latest release changes."
           draft: false