fixup

rvykydal · Mar 18, 2024 · c365f22 · c365f22
1 parent da00162
commit c365f22
Showing 1 changed file with 3 additions and 4 deletions.
diff --git a/.github/workflows/test-platforms.yml b/.github/workflows/test-platforms.yml
@@ -133,16 +133,15 @@ jobs:
         run: |
           set -eux
 
+          TARGET_BRANCH="${{ env.TARGET_BRANCH }}"
           git fetch origin
           git config user.name github-actions
           git config user.email [email protected]
           git log --oneline -1
-          git log --oneline -1 origin/${{ env.TARGET_BRANCH }}
-          git rebase origin/${{ env.TARGET_BRANCH }}
-          BASE_COMMIT=$(git merge-base HEAD origin/$TARGET_BRANCH)
+          git log --oneline -1 origin/$TARGET_BRANCH
+          BASE_COMMIT=$(git merge-base ${{ needs.pr-info.outputs.sha }} origin/$TARGET_BRANCH)
           CHANGED_TESTS=$(git diff --name-only $BASE_COMMIT HEAD -- *.ks.in $(find -maxdepth 1 -name '*.sh' -perm -u+x) | sed 's/\.ks\.in$//; s/\.sh$//' | sort -u | tr '\n' ' ')
           echo "changed_tests=${CHANGED_TESTS}" >> $GITHUB_OUTPUT
-          git checkout ${{ needs.pr-info.outputs.sha }}
 
       - name: Get skipped tests for platform ${{ matrix.platform }}
         id: get_platform_specs