workflow.yml update

Author: Basudev Bharat Bhushan

.github/workflows/workflow.yml

@@ -1,73 +1,81 @@
-name: Python Package Release
+name: Upload Python Package
 
 on:
   push:
     branches:
       - master
-      - main
 
 permissions:
   contents: write
-  packages: write
   id-token: write
-  pull-requests: write
+  actions: write
+  packages: write
 
 jobs:
-  prepare-release:
-    if: github.ref == 'refs/heads/master'
+  release:
     runs-on: ubuntu-latest
-
     steps:
-      - name: Checkout master
+      - name: Checkout master branch
         uses: actions/checkout@v4
+        with:
+          ref: master
+          fetch-depth: 0
+
+      # - name: Create and push to main
+      #   run: |
+      #     git checkout -b main
+      #     git push origin main
 
-      - name: Create release branch
+      - name: Create and push to feature branch
         run: |
           git checkout -b release-main
           git push origin release-main
 
-      - name: Raise PR to main
+      - name: Raise PR from release-main to main
         uses: peter-evans/create-pull-request@v5
         with:
           base: main
           head: release-main
-          title: "Release PR: release-main → main"
-          body: "Auto-generated release PR for version bump"
-          branch: pr-release-main
+          title: "Automated Release PR: release-main -> main"
+          body: "This PR contains the automated changes for the release process."
+          branch: pr-release-main-to-main
 
-  publish-release:
-    if: github.ref == 'refs/heads/main'
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Checkout main
-        uses: actions/checkout@v4
+      - name: Checkout release branch
+        run: git checkout main
 
       - name: Set up Python
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v3
         with:
           python-version: "3.x"
 
       - name: Install dependencies
         run: |
-          pip install --upgrade pip
+          python -m pip install --upgrade pip
           pip install build twine python-semantic-release setuptools-scm
 
-      - name: Configure Git
+      - name: Run semantic-release
+        env:
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: |
           git config user.name github-actions
           git config user.email github-actions@github.com
-
-      - name: Run semantic-release publish
-        env:
-          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        run: semantic-release publish
+          semantic-release version
+          semantic-release publish
 
       - name: Build package
         run: python -m build
 
-      - name: Upload to PyPI
+      - name: Publish package to PyPI
         env:
           TWINE_USERNAME: __token__
           TWINE_PASSWORD: ${{ secrets.PYPI_API_TOKEN }}
         run: twine upload dist/*
+
+      - name: Raise PR from main to master
+        uses: peter-evans/create-pull-request@v5
+        with:
+          base: master
+          head: main
+          title: "Release PR: main -> master"
+          body: "This PR merges the changes from the main branch back into master after the release."
+          branch: pr-main-to-master