From 802267fb5b0a17bf7915b78abbb80afa407d8815 Mon Sep 17 00:00:00 2001
From: Larvan2 <78135608+Larvan2@users.noreply.github.com>
Date: Sat, 31 Aug 2024 23:38:31 +0800
Subject: [PATCH] ci: better release

---
 .github/workflows/build.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index b62e982000..5ba2ef6f9e 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -387,18 +387,18 @@ jobs:
           git fetch --tags
           echo "PREVERSION=$(git describe --tags --abbrev=0 HEAD)" >> $GITHUB_ENV
 
-      - name: Merge Alpha branch into Meta
+      - name: Force push Alpha branch to Meta
         run: |
           git config --global user.email "github-actions[bot]@users.noreply.github.com"
           git config --global user.name "github-actions[bot]"
           git fetch origin Alpha:Alpha
-          git merge Alpha
-          git push origin Meta
+          git push origin Alpha:Meta --force
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
-      - name: Tag the commit
+      - name: Tag the commit on Alpha
         run: |
+          git checkout Alpha 
           git tag ${{ github.event.inputs.version }}
           git push origin ${{ github.event.inputs.version }}
         env: