diff options
| author | Mikhail Goncharov <goncharov.mikhail@gmail.com> | 2023-10-17 11:24:43 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-10-17 11:24:43 +0200 |
| commit | 815193f6be08e0f5876c9a0cb88c9df104710e68 (patch) | |
| tree | 04aee79dcc82879d73227d46b99436a7e49970e8 /.ci | |
| parent | f0601c7569c6e2001b180136e1b699f577fd5c06 (diff) | |
| download | llvm-815193f6be08e0f5876c9a0cb88c9df104710e68.zip llvm-815193f6be08e0f5876c9a0cb88c9df104710e68.tar.gz llvm-815193f6be08e0f5876c9a0cb88c9df104710e68.tar.bz2 | |
[ci] diff with main merge-base (#69308)
Basically a reland of ec9d80ec43f5761a34c4a785c67d9e7d21ec8bda but now
with fetching of main before that to get a correct merge base.
Diffstat (limited to '.ci')
| -rwxr-xr-x | .ci/generate-buildkite-pipeline-premerge | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/.ci/generate-buildkite-pipeline-premerge b/.ci/generate-buildkite-pipeline-premerge index 1028c08..9c6f5ae 100755 --- a/.ci/generate-buildkite-pipeline-premerge +++ b/.ci/generate-buildkite-pipeline-premerge @@ -21,18 +21,11 @@ set -eu set -o pipefail # Environment variables script works with: -# List of files affected by this commit -: ${MODIFIED_FILES:=$(git diff --name-only HEAD~1)} + # Fetch origin/main to have an up to date merge base for main...HEAD diff. git fetch origin main:main -echo "files modified HEAD~1" >&2 -git --no-pager diff --name-only HEAD~1 >&2 -echo "files modified main...HEAD" >&2 -git --no-pager diff --name-only main...HEAD | head -n 10 >&2 -merge_base=$(git merge-base main HEAD) -echo "merge base with main $merge_base" >&2 -echo "git log" >&2 -git --no-pager log --oneline --abbrev-commit -n 5 >&2 +# List of files affected by this commit +: ${MODIFIED_FILES:=$(git diff --name-only main...HEAD)} # Filter rules for generic windows tests : ${WINDOWS_AGENTS:='{"queue": "windows"}'} # Filter rules for generic linux tests |