update workflow

Freezor · Jun 16, 2024 · cea77de · cea77de
1 parent 746b179
commit cea77de
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 10 deletions.
diff --git a/.github/workflows/draft-prerelease-on-pushed-tag.yml b/.github/workflows/draft-prerelease-on-pushed-tag.yml
@@ -23,9 +23,7 @@ jobs:
       - name: Extract branch name
         id: extract_branch
         run: |
-          git fetch --all
-          $commitSHA = git rev-parse HEAD
-          $branch = git branch -r --contains $commitSHA | Select-String -Pattern 'origin/' | Select-Object -First 1 | ForEach-Object { $_.Line -replace '.*origin/', '' } | ForEach-Object { $_.Trim() }
+          $branch = '${{ github.ref }}' -replace 'refs/heads/', ''
           echo "branch=$branch" >> $env:GITHUB_OUTPUT
           Write-Host "The current branch is: $branch"
         shell: pwsh

diff --git a/.github/workflows/draft-release-on-merge-to-release-branch.yml b/.github/workflows/draft-release-on-merge-to-release-branch.yml
@@ -26,9 +26,7 @@ jobs:
       - name: Extract branch name
         id: extract_branch
         run: |
-          git fetch --all
-          $commitSHA = git rev-parse HEAD
-          $branch = git branch -r --contains $commitSHA | Select-String -Pattern 'origin/' | Select-Object -First 1 | ForEach-Object { $_.Line -replace '.*origin/', '' } | ForEach-Object { $_.Trim() }
+          $branch = '${{ github.ref }}' -replace 'refs/heads/', ''
           echo "branch=$branch" >> $env:GITHUB_OUTPUT
           Write-Host "The current branch is: $branch"
         shell: pwsh
@@ -167,4 +165,4 @@ jobs:
         with:
           files: "artefacts/release/v${{ steps.generate_version_number.outputs.version }}/*.zip"
           repo-token: ${{ secrets.GITHUB_TOKEN }}
-          release-tag: "v${{ steps.generate_version_number.outputs.version }}"
+          release-tag: "v${{ steps.generate_version_number.outputs.version }}"
diff --git a/.github/workflows/prerelease-on-merge-to-main.yml b/.github/workflows/prerelease-on-merge-to-main.yml
@@ -79,9 +79,7 @@ jobs:
       - name: Extract branch name
         id: extract_branch
         run: |
-          git fetch --all
-          $commitSHA = git rev-parse HEAD
-          $branch = git branch -r --contains $commitSHA | Select-String -Pattern 'origin/' | Select-Object -First 1 | ForEach-Object { $_.Line -replace '.*origin/', '' } | ForEach-Object { $_.Trim() }
+          $branch = '${{ github.ref }}' -replace 'refs/heads/', ''
           echo "branch=$branch" >> $env:GITHUB_OUTPUT
           Write-Host "The current branch is: $branch"
         shell: pwsh