From b16acf351a70209fe9ad576b504b806d991c22a7 Mon Sep 17 00:00:00 2001 From: kudo-sync-bot Date: Sun, 22 Dec 2024 23:59:40 -0800 Subject: [PATCH] =?UTF-8?q?Added=20`git=20pull`=20echo=20=E2=86=9E=20[auto?= =?UTF-8?q?-sync=20from=20https://github.com/adamlui/ai-web-extensions]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- utils/bump.sh | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/utils/bump.sh b/utils/bump.sh index 0181c12..7adb916 100644 --- a/utils/bump.sh +++ b/utils/bump.sh @@ -67,12 +67,15 @@ for manifest_path in "${MANIFEST_PATHS[@]}" ; do ((bumped_cnt++)) done - -# COMMIT/PUSH bump(s) if (( $bumped_cnt == 0 )) ; then echo -e "${BW}Completed. No manifests bumped.${NC}" ; exit 0 ; fi + +# PULL latest changes +echo -e "${BY}Pulling latest changes from remote to sync local repository...${NC}\n" git pull || (echo -e "${BR}Merge failed, please resolve conflicts!${NC}" && exit 1) + +# ADD/COMMIT/PUSH bump(s) plural_suffix=$((( $bumped_cnt > 1 )) && echo "s") -echo -e "${BG}${bumped_cnt} manifest${plural_suffix} bumped!\n${NC}" +echo -e "\n${BG}${bumped_cnt} manifest${plural_suffix} bumped!\n${NC}" echo -e "${BY}Committing bump${plural_suffix} to Git...\n${NC}" COMMIT_MSG="Bumped \`version\`" unique_versions=($(printf "%s\n" "${new_versions[@]}" | sort -u))