From 348232e527e0363cd27a7a49302dad2de3817be6 Mon Sep 17 00:00:00 2001 From: Johan Commelin Date: Thu, 31 Oct 2024 07:30:43 +0000 Subject: [PATCH] chore(scripts/create-adaptation-pr): auto mode by default, no-edit merges (#18485) Sets the default value of `--AUTO` to `yes` Adds the `--no-edit` flag to the merge commands in the script --- scripts/create-adaptation-pr.sh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/scripts/create-adaptation-pr.sh b/scripts/create-adaptation-pr.sh index 8af305216c0e8..32067764818a0 100755 --- a/scripts/create-adaptation-pr.sh +++ b/scripts/create-adaptation-pr.sh @@ -15,7 +15,7 @@ set -e # abort whenever a command in the script fails { # Default values -AUTO="no" +AUTO="yes" # Function to display usage usage() { @@ -25,7 +25,7 @@ usage() { echo "BUMPVERSION: The upcoming release that we are targeting, e.g., 'v4.10.0'" echo "NIGHTLYDATE: The date of the nightly toolchain currently used on 'nightly-testing'" echo "NIGHTLYSHA: The SHA of the nightly toolchain that we want to adapt to" - echo "AUTO: Optional flag to specify automatic mode, default is 'no'" + echo "AUTO: Optional flag to specify automatic mode, default is 'yes'" exit 1 } @@ -90,7 +90,7 @@ echo "### [auto] checkout 'bump/$BUMPVERSION' and merge the latest changes from git checkout "bump/$BUMPVERSION" git pull -git merge origin/master || true # ignore error if there are conflicts +git merge --no-edit origin/master || true # ignore error if there are conflicts # Check if there are merge conflicts if git diff --name-only --diff-filter=U | grep -q .; then @@ -135,7 +135,7 @@ echo echo "### [auto] create a new branch 'bump/nightly-$NIGHTLYDATE' and merge the latest changes from 'origin/nightly-testing'" git checkout -b "bump/nightly-$NIGHTLYDATE" -git merge $NIGHTLYSHA || true # ignore error if there are conflicts +git merge --no-edit $NIGHTLYSHA || true # ignore error if there are conflicts # Check if there are merge conflicts if git diff --name-only --diff-filter=U | grep -q .; then @@ -252,7 +252,7 @@ echo "### [auto] checkout the 'nightly-testing' branch and merge the new branch git checkout nightly-testing git pull -git merge "bump/nightly-$NIGHTLYDATE" || true # ignore error if there are conflicts +git merge --no-edit "bump/nightly-$NIGHTLYDATE" || true # ignore error if there are conflicts # Check if there are merge conflicts if git diff --name-only --diff-filter=U | grep -q .; then