From affa3fbe283ad81e30357eb35f238ec70eb7cad7 Mon Sep 17 00:00:00 2001
From: rharkor <louis@huort.com>
Date: Sat, 9 Mar 2024 17:50:41 +0100
Subject: [PATCH] fix: release

---
 .github/workflows/release.yml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 58232b03..1f8ed089 100644
--- 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 "louis@huort.com"
-          git config pull.rebase false
-          git pull
+          git config user.email "actions@github.com"
+          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