fix: release

rharkor · Mar 9, 2024 · affa3fb · affa3fb
1 parent aed822f
commit affa3fb
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -37,12 +37,12 @@ jobs:
         run: |
           echo "Syncing ${{ github.ref_name }} to ${{ github.ref_name }}-release"
           git config user.name "GitHub Actions"
-          git config user.email "[email protected]"
-          git config pull.rebase false
-          git pull
+          git config user.email "[email protected]"
+          git fetch --unshallow
           git checkout ${{ github.ref_name }}-release
-          git merge ${{ github.ref_name }}
-          git push origin ${{ github.ref_name }}-release
+          git pull
+          git merge --no-ff ${{ github.ref_name }} -m "Sync ${{ github.ref_name }} to ${{ github.ref_name }}-release"
+          git push
 
   release:
     name: Release