Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[ci] diff with main merge-base #69308

Merged
merged 1 commit into from
Oct 17, 2023
Merged

[ci] diff with main merge-base #69308

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 3 additions & 10 deletions .ci/generate-buildkite-pipeline-premerge
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down