From 090f200743e8b6ecb4e6634dc9b7bbae26649504 Mon Sep 17 00:00:00 2001
From: Cat Chen <catchen@catchen.me>
Date: Wed, 23 Oct 2024 12:14:03 -0700
Subject: [PATCH 1/3] Fixed missing env vars in some test workflow steps

---
 .github/workflows/test.yml | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 9cf3e394..045d60f9 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -197,7 +197,7 @@ jobs:
         continue-on-error: true
         env:
           GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          SHA: ${{ github.sha }}
+          TEST_HEAD_PR_NUMBER: ${{ steps.open-head-pr.outputs.test-head-pr-number }}
         run: |
           TEST_PR_STATE=`gh pr view $TEST_HEAD_PR_NUMBER --json 'state' -q '.state'`
           if [ "$TEST_PR_STATE" = 'MERGED' ]
@@ -220,14 +220,13 @@ jobs:
         continue-on-error: true
         env:
           GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          TEST_BASE_PR_NUMBER: ${{ steps.open-base-pr.outputs.test-base-pr-number }}
         run: |
           gh pr close $TEST_BASE_PR_NUMBER -d -c "Finished testing $SHA by $RUN_NUMBER-$RUN_ATTEMPT. Closing PR."
 
       - name: Delete remote test base branch
         if: ${{ always() }}
         continue-on-error: true
-        env:
-          TEST_BASE_BRANCH_NAME: ${{ format('workflows/tests/base/id-{0}/run-{1}/attempt-{2}/sha-{3}', github.run_id, github.run_number, github.run_attempt, github.sha) }}
         run: |
           if test $(git ls-remote origin --heads "$TEST_BASE_BRANCH_NAME" | wc -l ) != 0
           then

From d0a5d03a9d3d35da0a2600c47647868be265ce03 Mon Sep 17 00:00:00 2001
From: Cat Chen <catchen@catchen.me>
Date: Wed, 23 Oct 2024 19:18:21 +0000
Subject: [PATCH 2/3] Test base commit for #4878
 (24cf1eca59b5fae2ec8e3fd14ff56dfbb8ccfbd9) by 7842-1


From af7b6f1da4dffe46c13fc7267622fcfae5145e8b Mon Sep 17 00:00:00 2001
From: Cat Chen <catchen@catchen.me>
Date: Wed, 23 Oct 2024 19:18:43 +0000
Subject: [PATCH 3/3] Test base commit for #4879
 (6db89445889c0464e587699a28b4d5a4e888e438) by 7846-1