chore: correct bump version workflow

openedx · Aug 3, 2023 · e478446 · e478446
1 parent 0476f01
commit e478446
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/.github/workflows/bump-version.yaml b/.github/workflows/bump-version.yaml
@@ -3,6 +3,7 @@ on:
   push:
     branches:
       - main
+  pull_request:
 
 jobs:
   bumpversion:
@@ -42,9 +43,11 @@ jobs:
       - name: Push branch
         if: steps.tag_version.outputs.new_version
         run: |
-          git checkout -b bot/v${{ steps.tag_version.outputs.new_version }}
-          git push -d origin bot/v${{ steps.tag_version.outputs.new_version }}
-          git push origin bot/v${{ steps.tag_version.outputs.new_version }}
+          branch_name="bot/v${{ steps.tag_version.outputs.new_version }}"
+          git fetch --prune origin
+          git checkout -b $branch_name || git checkout $branch_name
+          git push --delete origin $branch_name  # Delete the branch if it already exists
+          git push origin $branch_name
       - name: Create Pull Request
         if: steps.tag_version.outputs.new_version
         id: cpr