From c4a928deed1a466983b710ccdd4fbff56c659652 Mon Sep 17 00:00:00 2001 From: Leonid Pospelov Date: Mon, 23 Dec 2024 04:54:05 +0500 Subject: [PATCH] internal: rearrange Git SHA capture in workflow (#2279) --- .github/actions/pr_base/action.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/actions/pr_base/action.yml b/.github/actions/pr_base/action.yml index 8ff36593c2..564650b545 100644 --- a/.github/actions/pr_base/action.yml +++ b/.github/actions/pr_base/action.yml @@ -55,6 +55,13 @@ runs: "token": "${{inputs.SKYMP5_PATCHES_PAT}}" } ] + + - name: Get Git SHA Before Gather + id: repo_sha + shell: powershell + run: | + $sha = git rev-parse HEAD + echo "sha=$sha" | Out-File -FilePath $Env:GITHUB_ENV -Encoding utf8 -Append - name: Commit gathered PRs if: ${{ inputs.DEPLOY_BRANCH != '' }} @@ -66,13 +73,6 @@ runs: git commit -m "Merge PRs ${{inputs.DEPLOY_BRANCH}}" shell: powershell - - name: Get Current Git SHA - id: repo_sha - shell: powershell - run: | - $sha = git rev-parse HEAD - echo "sha=$sha" | Out-File -FilePath $Env:GITHUB_ENV -Encoding utf8 -Append - - name: Cache build dir uses: actions/cache@v4 with: