Update release.yml

Author: egil

.github/workflows/release.yml

@@ -90,13 +90,9 @@ jobs:
       - name: 🛠️ Upload library to NuGet.org repository
         run: echo "TODO"      
 
-      - name: ⏩ Merge stable with main, push both
-        run: | 
-          git push origin stable
-          git checkout main
-          git merge -S stable
-          git push origin main
-                
+      - name: ⏩ Push stable branch
+        run: git push origin stable
+
       - name: 🛠️ Create GitHub release
         uses: thomaseizinger/[email protected]
         env:
@@ -108,3 +104,24 @@ jobs:
           body: ${{ steps.changelog_reader.outputs.changes }}
           draft: false
           prerelease: ${{ env.NBGV_PublicRelease == 'False' }}
+
+      - name: ⏩ Merge stable with main, push main
+        run: | 
+          git checkout main
+          git merge -S stable
+          git push origin main
+          
+      - name: ⏭ Create pull request from stable to main
+        if: ${{ failure() }}
+        uses: thomaseizinger/[email protected]
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          head: stable
+          base: main
+          title: Update main with changes in stable after v${{ env.SIMPLE_VERSION }} release
+          reviewers: ${{ github.actor }} # By default, we request a review from the person who triggered the workflow.
+          body: |
+            Hi @${{ github.actor }}
+            
+            This PR was created because the [release workflow](https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}) failed to automatically merge stable into main.