Pass branch to snapshot script

knowledgepicker · Dec 3, 2024 · c413c40 · c413c40
1 parent 939b4a8
commit c413c40
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 11 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -33,6 +33,6 @@ jobs:
     - name: Process test results
       if: ${{ success() || failure() }}
       shell: pwsh
-      run: ./eng/process-test-results.ps1
+      run: ./eng/process-test-results.ps1 -Branch "${{ github.ref_name }}"
       env:
         GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/eng/process-test-results.ps1 b/eng/process-test-results.ps1
@@ -1,5 +1,6 @@
 [CmdletBinding(PositionalBinding=$false)]
 param (
+    $branch = $null,
     [switch]$dry = $false
 )
 
@@ -8,7 +9,8 @@ $ErrorActionPreference = "Stop"
 
 # If snapshots are changed, create a pull request.
 if (git status --porcelain) {
-    $currentBranch = $(git branch --show-current)
+    $currentBranch = $branch ?? $(git branch --show-current)
+    Write-Output "Branch: '$currentBranch'"
 
     # Avoid making new PR against snapshot-updating PR.
     if ($currentBranch.StartsWith("update-snapshots")) {
@@ -22,15 +24,11 @@ if (git status --porcelain) {
     }
 
     git branch -D update-snapshots/$currentBranch
-    git checkout -b update-snapshots/$currentBranch
-    try {
-        git commit -am "Update snapshots"
-        git push -f origin update-snapshots/$currentBranch
-        gh pr create --base $currentBranch --title "Update snapshots" `
-            --body "Generate automatically by script ``process-test-results.ps1``."
-    } finally {
-        git checkout $currentBranch
-    }
+    git checkout -b update-snapshots/
+    git commit -am "Update snapshots"
+    git push -f origin update-snapshots/$currentBranch
+    gh pr create --base $currentBranch --title "Update snapshots" `
+        --body "Generated automatically by script ``process-test-results.ps1``."
 } else {
     Write-Output "No changes in snapshots"
 }