Skip to content

Commit ec9d80e

Browse files
authored
[ci] Diff against main when determining what files have changed for pre-commit CI (#67743)
Since we moved to Github PRs, the workflow has changed a bit and folks often merge `main` back into their PR branch. This is fine, except the previous way of determining modified files for pre-commit CI would use the content modified just in the latest commit, whatever it is. This means that in case someone merged main back into their PR branch, we'd think that the files in the merge commit were modified by the PR, and we'd spuriously trigger a CI run. This should fix this issue. The downside is that the merge target is hardcoded to `main`, which might not always be what we want. I still think this is an improvement over the status quo.
1 parent 2cac95b commit ec9d80e

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

.ci/generate-buildkite-pipeline-premerge

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ set -o pipefail
2222

2323
# Environment variables script works with:
2424
# List of files affected by this commit
25-
: ${MODIFIED_FILES:=$(git diff --name-only HEAD~1)}
25+
: ${MODIFIED_FILES:=$(git diff --name-only main...HEAD)}
2626
# Filter rules for generic windows tests
2727
: ${WINDOWS_AGENTS:='{"queue": "windows"}'}
2828
# Filter rules for generic linux tests

0 commit comments

Comments
 (0)