updated release workflow to merge develop into main when a release is invoked

.github/workflows/release.yml

@@ -375,7 +375,7 @@ jobs:
 
 
     
-  create-release:
+  do-release:
     needs: [run-unit-tests-linux, run-unit-tests-windows, build-windows, build-debian, build-arch, build-rhel]
     if: ${{ github.event_name == 'workflow_dispatch' && github.event.inputs.DO_RELEASE == 'true' && needs.build-windows.result == 'success' && needs.build-debian.result == 'success' && needs.build-arch.result == 'success' && needs.build-rhel.result == 'success' }}
     runs-on: ubuntu-latest
@@ -384,10 +384,24 @@ jobs:
         uses: actions/checkout@v4
         with:
           ref: ${{ github.event.inputs.branch || github.head_ref || github.ref }}
-        
+          fetch-depth: 0
+          token: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Configure git
+        run: |
+          git config user.name "github-actions[bot]"
+          git config user.email "github-actions[bot]@users.noreply.github.com"
+
+      - name: Rebase develop onto main
+        run: |
+          git fetch origin main develop
+          git checkout main
+          git rebase origin/develop
+          git push origin main
+
       - name: Install Poetry
         uses: snok/install-poetry@v1
-        
+
       - name: Get version
         id: version
         run: echo "version=$(poetry version -s)" >> $GITHUB_OUTPUT
@@ -456,8 +470,8 @@ jobs:
           AWS_PAGER: ""
   
   sync-wiki:
-    needs: create-release
-    if: always() && needs.create-release.result == 'success'
+    needs: do-release
+    if: always() && needs.do-release.result == 'success'
     uses: ./.github/workflows/sync-wiki.yml
     with:
       branch: ${{ github.event.inputs.branch || github.ref }}