Merge pull request #2263 from Agenta-AI/fix-bump-workflow

Fix bump workflow
Agenta-AI · Nov 15, 2024 · a76aed8 · a76aed8
2 parents 0befa1e + 945568a
commit a76aed8
Showing 1 changed file with 22 additions and 12 deletions.
diff --git a/.github/workflows/bump-versions.yml b/.github/workflows/bump-versions.yml
@@ -14,10 +14,13 @@ on:
           - major
 
 jobs:
-  migrate-db-schema-stage:
-    name: Bump version
-    continue-on-error: false
+  bump-version:
+    name: Bump version and create PR
     runs-on: ubuntu-latest
+    outputs:
+      new_version: ${{ steps.bump_versions.outputs.NEW_VERSION }}
+      versions_match: ${{ steps.bump_versions.outputs.VERSIONS_MATCH }}
+      pr_number: ${{ steps.create-pr.outputs.pull-request-number }}
 
     steps:
       - name: Checkout repository
@@ -71,21 +74,13 @@ jobs:
             echo "VERSIONS_MATCH=false" >> $GITHUB_OUTPUT
           fi
 
-      - name: Create and push tag
-        if: steps.bump_versions.outputs.VERSIONS_MATCH == 'true'
-        run: |
-          git config --global user.name "${{ github.actor }}"
-          git config --global user.email "${{ github.actor_id }}+${{ github.actor }}@users.noreply.github.com"
-          git tag -a "v${{ steps.bump_versions.outputs.NEW_VERSION }}" -m "Version ${{ steps.bump_versions.outputs.NEW_VERSION }}"
-          git push origin "v${{ steps.bump_versions.outputs.NEW_VERSION }}"
-
       - name: Create Pull Request
         if: steps.bump_versions.outputs.VERSIONS_MATCH == 'true'
         uses: peter-evans/create-pull-request@v6
         with:
           commit-message: v${{ steps.bump_versions.outputs.NEW_VERSION }}
           author: ${{ github.actor }} <${{ github.actor_id }}+${{ github.actor }}@users.noreply.github.com>
-          branch: v${{ steps.bump_versions.outputs.NEW_VERSION }}
+          branch: release/v${{ steps.bump_versions.outputs.NEW_VERSION }}
           delete-branch: true
           title: "v${{ steps.bump_versions.outputs.NEW_VERSION }}"
           body: |
@@ -99,3 +94,18 @@ jobs:
         run: |
           echo "Versions in the three folders do not match. Please check and update manually."
           exit 1
+
+  create-tag:
+    needs: bump-version
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      - name: Create and push tag
+        run: |
+          git config --global user.name "${{ github.actor }}"
+          git config --global user.email "${{ github.actor_id }}+${{ github.actor }}@users.noreply.github.com"
+          git tag -a "v${{ needs.bump-version.outputs.new_version }}" -m "Version ${{ needs.bump-version.outputs.new_version }}"
+          git push origin "v${{ needs.bump-version.outputs.new_version }}"