forked from elastic/elasticsearch
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
update-branch should sync lucene_snapshot with 8.x
- Loading branch information
1 parent
7c6b493
commit 39ec638
Showing
1 changed file
with
12 additions
and
3 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -7,12 +7,21 @@ if [[ "$BUILDKITE_BRANCH" != "lucene_snapshot"* ]]; then | |
exit 1 | ||
fi | ||
|
||
echo --- Updating "$BUILDKITE_BRANCH" branch with main | ||
if [[ "$BUILDKITE_BRANCH" == "lucene_snapshot_10" ]]; then | ||
UPSTREAM="main" | ||
elif [[ "$BUILDKITE_BRANCH" == "lucene_snapshot" ]]; then | ||
UPSTREAM="8.x" | ||
else | ||
echo "Error: unknown branch: $BUILDKITE_BRANCH" | ||
exit 1 | ||
fi | ||
|
||
echo --- Updating "$BUILDKITE_BRANCH" branch with "$UPSTREAM" | ||
|
||
git config --global user.name elasticsearchmachine | ||
git config --global user.email '[email protected]' | ||
|
||
git checkout "$BUILDKITE_BRANCH" | ||
git fetch origin main | ||
git merge --no-edit origin/main | ||
git fetch origin "$UPSTREAM" | ||
git merge --no-edit "origin/$UPSTREAM" | ||
git push origin "$BUILDKITE_BRANCH" |