@@ -74,18 +74,19 @@ jobs:
7474 TARGET_BRANCH : ${{ github.base_ref || github.event.merge_group.base_ref || 'main' }}
7575 run : |
7676 git fetch origin $TARGET_BRANCH
77- echo "branch=origin/$TARGET_BRANCH" >> "$GITHUB_OUTPUT"
77+ target_sha=$(git rev-parse FETCH_HEAD)
78+ echo "sha=${target_sha}" >> "$GITHUB_OUTPUT"
7879 - name : Setup Python
7980 uses : actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065 # v5
8081 with :
8182 python-version : " 3.10"
8283 - name : Set number of files changes in packages and preview-packages directories
8384 id : packages
8485 env :
85- TARGET_BRANCH_REF : ${{ steps.target.outputs.branch }}
86+ TARGET_SHA : ${{ steps.target.outputs.sha }}
8687 run : |
87- git diff "$TARGET_BRANCH_REF "...HEAD -- packages preview-packages > /dev/null
88- num_files_changed=$(git diff "$TARGET_BRANCH_REF "...HEAD -- packages preview-packages | wc -l | tr -d ' ')
88+ git diff "$TARGET_SHA "...HEAD -- packages preview-packages > /dev/null
89+ num_files_changed=$(git diff "$TARGET_SHA "...HEAD -- packages preview-packages | wc -l | tr -d ' ')
8990 echo "num_files_changed=${num_files_changed}" >> "$GITHUB_OUTPUT"
9091 - name : Install coverage
9192 if : ${{ steps.packages.outputs.num_files_changed > 0 }}
@@ -103,9 +104,9 @@ jobs:
103104 # TODO: default to 100% coverage after next gapic-generator release
104105 # https://github.com/googleapis/google-cloud-python/issues/17459
105106 DEFAULT_FAIL_UNDER : 99
106- TARGET_BRANCH_REF : ${{ steps.target.outputs.branch }}
107+ TARGET_SHA : ${{ steps.target.outputs.sha }}
107108 run : |
108- target_ref="$TARGET_BRANCH_REF "
109+ target_ref="$TARGET_SHA "
109110 # Find all modified packages
110111 modified_packages=$(git diff --name-only ${target_ref}...HEAD -- packages preview-packages | cut -d/ -f1,2 | sort -u)
111112
0 commit comments