From 4a32f8d3d03c1c50e2d066718cf7049b8a4a6a0b Mon Sep 17 00:00:00 2001
From: pyshx <piyushchauhan1004@gmail.com>
Date: Wed, 6 Nov 2024 13:02:22 +0530
Subject: [PATCH] ci: fix stage workflow

---
 .github/workflows/stage.yml | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/stage.yml b/.github/workflows/stage.yml
index 78bcd291..47ece0d5 100644
--- a/.github/workflows/stage.yml
+++ b/.github/workflows/stage.yml
@@ -1,7 +1,6 @@
 name: Stage
 on:
   workflow_dispatch:
-
 jobs:
   stage:
     name: Stage
@@ -13,16 +12,18 @@ jobs:
         with:
           app-id: ${{ vars.GH_APP_ID }}
           private-key: ${{ secrets.GH_APP_PRIVATE_KEY }}
+      - uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+          token: ${{ steps.app-token.outputs.token }}
       - name: git config
         env:
+          GH_APP_ID: ${{ vars.GH_APP_ID }}
           GH_APP_USER: ${{ vars.GH_APP_USER }}
         run: |
-          git config --global user.name $GH_APP_USER
+          git config --global user.name ${GH_APP_USER}
+          git config user.email ${GH_APP_ID}+${GH_APP_USER}[bot]@users.noreply.github.com
           git config --global pull.rebase false
-      - uses: actions/checkout@v3
-        with:
-          fetch-depth: 0
-          token: ${{ steps.app-token.outputs.token }}
       - name: Checkout release branch
         run: git switch release || git switch -c release
       - name: Merge main branch to release branch