Changing to open PR if candidate o.w. just push to pypi

amontanez24 · amontanez24 · commit 20668170ed74 · 2025-04-28T15:42:22.000-05:00
diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
@@ -28,6 +28,9 @@
 name: Release
 
 on:
+  release:
+    types: [published]
+
   workflow_dispatch:
     inputs:
       candidate:
@@ -38,15 +41,15 @@ on:
       test_pypi:
         description: 'If true, this will push to the test pypi instead of regular.'
         type: boolean
-        default: false
+        default: true
 
 jobs:
   release:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
         with:
-          ref: main-clone
+          ref: ${{ inputs.candidate && 'main-clone' || 'stable' }}
 
       - name: Set up Python
         uses: actions/setup-python@v5
@@ -58,24 +61,6 @@ jobs:
             python -m pip install --upgrade pip
             python -m pip install .[dev]
 
-      - name: Configure Git user
-        run: |
-          git config user.name "SDV Team"
-          git config user.email "dataceboteam@gmail.com"
-          git remote set-url origin https://x-access-token:${{ secrets.GH_ACCESS_TOKEN }}@github.com/${{ github.repository }}
-
-      - name: Merge main to stable and push tags
-        # if: ${{ !inputs.candidate && !inputs.test_pypi }}
-        if: ${{ !inputs.candidate }}
-        run: |
-          make check-clean
-          make check-candidate
-          make check-history
-          git checkout stable-clone || git checkout -b stable-clone
-          git merge --no-ff main-clone -m"make release-tag: Merge branch 'main' into stable"
-          make bumpversion-release
-          git push --tags origin stable-clone
-
       - name: Create wheel
         run: |
           make dist
@@ -90,13 +75,35 @@ jobs:
         if: ${{ inputs.candidate && !inputs.test_pypi }}
         run: |
           make bumpversion-candidate
-          make git-push
-    
-      - name: Merge to main and bump to next patch
-        # if: ${{ !inputs.candidate && !inputs.test_pypi }}
-        if: ${{ !inputs.candidate }}
+
+      - name: Get last commit message
+        if: ${{ inputs.candidate && !inputs.test_pypi }}
+        id: get_message
         run: |
-          git checkout main-clone
-          git merge stable-clone
-          make bumpversion-patch
-          make git-push
+          COMMIT_MESSAGE=$(git log -1 --pretty=%B)
+          echo "commit_message<<EOF" >> $GITHUB_ENV
+          echo "$COMMIT_MESSAGE" >> $GITHUB_ENV
+          echo "EOF" >> $GITHUB_ENV
+
+      - name: Create PR for candidate
+        if: ${{ inputs.candidate && !inputs.test_pypi }}
+        id: bump-candidate-pr
+        uses: peter-evans/create-pull-request@v4
+        with:
+          token: ${{ secrets.GH_ACCESS_TOKEN }}
+          commit-message: ${{ env.commit_message }}
+          author: "github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>"
+          committer: "github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>"
+          title: ${{ env.commit_message }}
+          body: "This is an auto-generated PR to bump the version to the next release candidate."
+          branch: bump-release-candidate
+          branch-suffix: short-commit-hash
+          base: main
+
+      - name: Enable Pull Request Automerge
+        if: steps.bump-candidate-pr.outputs.pull-request-operation == 'created'
+        uses: peter-evans/enable-pull-request-automerge@v3
+        with:
+          token: ${{ secrets.GH_ACCESS_TOKEN }}
+          pull-request-number: ${{ steps.bump-candidate-pr.outputs.pull-request-number }}
+          merge-method: squash
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -1,6 +1,9 @@
 name: Release
 
 on:
+  release:
+    types: [published]
+
   workflow_dispatch:
     inputs:
       candidate:
@@ -11,13 +14,16 @@ on:
       test_pypi:
         description: 'If true, this will push to the test pypi instead of regular.'
         type: boolean
-        default: false
+        default: true
 
 jobs:
   release:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
+        with:
+          ref: ${{ inputs.candidate && 'main-clone' || 'stable' }}
+
       - name: Set up Python
         uses: actions/setup-python@v5
         with:
@@ -28,40 +34,49 @@ jobs:
             python -m pip install --upgrade pip
             python -m pip install .[dev]
 
-      - name: Configure Git user
-        run: |
-          git config user.name "SDV Team"
-          git config user.email "dataceboteam@gmail.com"
-          git remote set-url origin https://x-access-token:${{ secrets.GH_ACCESS_TOKEN }}@github.com/${{ github.repository }}
-
-      - name: Merge main to stable and push tags
-        if: ${{ !inputs.candidate && !inputs.test_pypi }}
-        run: |
-          make check-release
-          make git-merge-main-stable
-          make bumpversion-release
-          make git-push-tags-stable
-
       - name: Create wheel
         run: |
-          make check-main
           make dist
 
       - name: Publish a Python distribution to PyPI
         uses: pypa/gh-action-pypi-publish@release/v1
         with:
           password: ${{ inputs.test_pypi && secrets.TEST_PYPI_API_TOKEN || secrets.PYPI_API_TOKEN }}
-          repository-url: ${{ inputs.test_pypi && 'https://test.pypi.org/legacy/' || 'https://pypi.org' }}
+          repository-url: ${{ inputs.test_pypi && 'https://test.pypi.org/legacy/' || 'https://upload.pypi.org/legacy/' }}
     
       - name: Bump to next candidate
         if: ${{ inputs.candidate && !inputs.test_pypi }}
         run: |
           make bumpversion-candidate
-          make git-push
-    
-      - name: Merge to main and bump to next patch
-        if: ${{ !inputs.candidate && !inputs.test_pypi}}
+
+      - name: Get last commit message
+        if: ${{ inputs.candidate && !inputs.test_pypi }}
+        id: get_message
         run: |
-          make git-merge-stable-main
-          make bumpversion-patch
-          make git-push
+          COMMIT_MESSAGE=$(git log -1 --pretty=%B)
+          echo "commit_message<<EOF" >> $GITHUB_ENV
+          echo "$COMMIT_MESSAGE" >> $GITHUB_ENV
+          echo "EOF" >> $GITHUB_ENV
+
+      - name: Create PR for candidate
+        if: ${{ inputs.candidate && !inputs.test_pypi }}
+        id: bump-candidate-pr
+        uses: peter-evans/create-pull-request@v4
+        with:
+          token: ${{ secrets.GH_ACCESS_TOKEN }}
+          commit-message: ${{ env.commit_message }}
+          author: "github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>"
+          committer: "github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>"
+          title: ${{ env.commit_message }}
+          body: "This is an auto-generated PR to bump the version to the next release candidate."
+          branch: bump-release-candidate
+          branch-suffix: short-commit-hash
+          base: main
+
+      - name: Enable Pull Request Automerge
+        if: steps.bump-candidate-pr.outputs.pull-request-operation == 'created'
+        uses: peter-evans/enable-pull-request-automerge@v3
+        with:
+          token: ${{ secrets.GH_ACCESS_TOKEN }}
+          pull-request-number: ${{ steps.bump-candidate-pr.outputs.pull-request-number }}
+          merge-method: squash
diff --git a/Makefile b/Makefile
@@ -170,21 +170,21 @@ publish: dist publish-confirm ## package and upload a release
 
 .PHONY: git-merge-main-stable
 git-merge-main-stable: ## Merge main into stable
-	git checkout stable-clone || git checkout -b stable-clone
-	git merge --no-ff main-clone -m"make release-tag: Merge branch 'main' into stable"
+	git checkout stable || git checkout -b stable
+	git merge --no-ff main -m"make release-tag: Merge branch 'main' into stable"
 
 .PHONY: git-merge-stable-main
 git-merge-stable-main: ## Merge stable into main
-	git checkout main-clone
-	git merge stable-clone
+	git checkout main
+	git merge stable
 
 .PHONY: git-push
 git-push: ## Simply push the repository to github
 	git push
 
 .PHONY: git-push-tags-stable
 git-push-tags-stable: ## Push tags and stable to github
-	git push --tags origin stable-clone
+	git push --tags origin stable
 
 .PHONY: bumpversion-release
 bumpversion-release: ## Bump the version to the next release
@@ -225,21 +225,21 @@ endif
 
 .PHONY: check-main
 check-main: ## Check if we are in main branch
-	ifneq ($(CURRENT_BRANCH),main-clone)
-		$(error Please make the release from main branch\n)
-	endif
+ifneq ($(CURRENT_BRANCH),main)
+	$(error Please make the release from main branch\n)
+endif
 
 .PHONY: check-candidate
 check-candidate: ## Check if a release candidate has been made
-	ifeq ($(CURRENT_VERSION),dev0)
-		$(error Please make a release candidate and test it before atempting a release)
-	endif
+ifeq ($(CURRENT_VERSION),dev0)
+	$(error Please make a release candidate and test it before atempting a release)
+endif
 
 .PHONY: check-history
 check-history: ## Check if HISTORY.md has been modified
-	ifeq ($(CHANGELOG_LINES),0)
-		$(error Please insert the release notes in HISTORY.md before releasing)
-	endif
+ifeq ($(CHANGELOG_LINES),0)
+	$(error Please insert the release notes in HISTORY.md before releasing)
+endif
 
 .PHONY: check-deps
 check-deps: # Dependency targets
