Skip to content
Merged
Changes from all commits
Commits
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
17 changes: 10 additions & 7 deletions release.sh
Original file line number Diff line number Diff line change
Expand Up @@ -42,10 +42,11 @@ update_follower () {
echo_run git fetch
echo_run git pull

# 2 · Apply the patch. Do not use 3way because commit history is not in common
# 2 · Apply the patch
if ! git apply --whitespace=nowarn "$PATCH_FILE"; then
echo "‼️ Some hunks could not be merged automatically."
echo; echo "Use a different terminal to fix files before continuing"
echo "‼️ Some changes could not be applied, so no changes were made."
echo "The command used was: git apply --whitespace=nowarn $PATCH_FILE"
echo; echo "Use a different terminal to fix and apply the patch before continuing"
pause
fi

Expand All @@ -63,7 +64,7 @@ update_follower () {
git commit -m "transfer v${new_ver} updates from LF to ${DIR}"

echo_run git status
pause # build & test checkpoint
echo "💻 Build & test $DIR now."; pause # build & test checkpoint
queue_push push origin "$MAIN_BRANCH"
cd ..
}
Expand Down Expand Up @@ -127,7 +128,9 @@ update_follower "$SECOND_DIR"
update_follower "$THIRD_DIR"

# ---------- GitHub Actions Test ---------
echo; echo "💻 Test GitHub Build Actions and then continue."; pause
echo;
echo "💻 Test GitHub Build Actions for all three repositories and then continue.";
pause

# --- return to primary path
cd ${PRIMARY_ABS_PATH}
Expand All @@ -136,7 +139,7 @@ cd ${PRIMARY_ABS_PATH}
echo; echo "🚀 Ready to tag and push changes upstream."
echo_run git log --oneline -2

read -rp "▶▶ Ready to tag? (y/N): " confirm
read -rp "▶▶ Ready to tag? (y/n): " confirm
if [[ $confirm =~ ^[Yy]$ ]]; then
git tag -a "v${new_ver}" -m "v${new_ver}"
queue_push_tag "v${new_ver}"
Expand All @@ -145,7 +148,7 @@ else
echo "🚫 tag skipped, can add later"
fi

read -rp "▶▶ Push everything now? (y/N): " confirm
read -rp "▶▶ Push everything now? (y/n): " confirm
if [[ $confirm =~ ^[Yy]$ ]]; then
for cmd in "${push_cmds[@]}"; do echo "+ $cmd"; bash -c "$cmd"; done
echo "🎉 All pushes completed."
Expand Down