Merge pull request #91 from sentry-demos/kw-fix-release-merge

fix: Missing branches for merge and push to master
sentry-demos · Feb 12, 2025 · 315fe56 · 315fe56
2 parents bf7ca86 + b672ce2
commit 315fe56
Showing 1 changed file with 8 additions and 5 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -60,7 +60,7 @@ jobs:
 
   publish-release:
     name: 'Publish Release'
-    needs: [bump-version, build-android, build-ios]
+    needs: [bump-version, build-android]
     runs-on: ubuntu-latest
     env:
       MERGE_TARGET: master
@@ -71,7 +71,7 @@ jobs:
 
       - uses: actions/checkout@v4
         with:
-          ref: ${{ env.MERGE_TARGET }}
+          fetch-depth: 0 # fetch all history all branches and tags
 
       - name: Download iOS App
         uses: actions/download-artifact@v4
@@ -100,6 +100,9 @@ jobs:
 
       - name: Merge Release
         run: |
-          git merge release/${{ env.VERSION }} \
-            && git push origin ${{ env.MERGE_TARGET }} \
-            || gh pr create --title "Merge Release ${{ env.VERSION }}" --body "Merge of the release ${{ env.VERSION }} into ${{ env.MERGE_TARGET }} failed. Please it merge manually."
+          git reset --hard
+          git checkout release/${{ env.VERSION }}
+          git checkout ${{ env.MERGE_TARGET }}
+          git merge release/${{ env.VERSION }} --no-ff
+          git push origin ${{ env.MERGE_TARGET }}
+          git push origin --delete release/${{ env.VERSION }}