Skip to content

Allow automated merge forward to target monthly releases #27

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

Merged
labkey-tchad merged 3 commits into from
Apr 17, 2026
+17 −1
Merged

Allow automated merge forward to target monthly releases #27

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6416290
Allow automated merge forward to target monthly releases
labkey-tchad Apr 17, 2026
318ab3f
More specific regex
labkey-tchad Apr 17, 2026
1d58876
Fix comment
labkey-tchad Apr 17, 2026
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
18 changes: 17 additions & 1 deletion branch-release/branch_release.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,11 @@ AHEAD_BY_EXP='"ahead_by":\d+'
# Get patch number from tag '19.3.11' => '11'
PATCH_NUMBER="$( echo "$TAG" | cut -d'.' -f3- | grep -oE '(^[0-9]+$)' )"

# By default, this automation will skip monthly releases that have locked in a '.0' release
# If you manually set a patch number that starts with a '_', it will merge forward to the specified version
# Get forced target release from tag '26.3._26.4' => '26.4'
FORCED_TARGET_RELEASE="$( echo "$TAG" | cut -d'.' -f3- | grep -oE '(^_[0-9]+\.[0-9]+$)' | cut -d'_' -f2- )"
Comment thread
labkey-willm marked this conversation as resolved.

SNAPSHOT_BRANCH="release${RELEASE_NUM}-SNAPSHOT"
RELEASE_BRANCH="release${RELEASE_NUM}"

Expand Down Expand Up @@ -310,7 +315,18 @@ case "_${release_minor}" in
_3|_7) NEXT_RELEASE="${release_major}.$(( release_minor + 4 ))";;
esac

if [ -n "${NEXT_RELEASE:-}" ]; then

if [ -n "${FORCED_TARGET_RELEASE:-}" ]; then
TARGET_BRANCH=release${FORCED_TARGET_RELEASE}-SNAPSHOT
if git rev-parse --verify --quiet "refs/remotes/origin/${TARGET_BRANCH}"; then
echo ""
echo "Overriding default merge forward target with '${TARGET_BRANCH}'. Merging ${TAG} to it."
MERGE_BRANCH="${FORCED_TARGET_RELEASE}_fb_bot_merge_${RELEASE_NUM}"
else
echo "The created tag '${TAG}' specified an invalid target release override: ${TARGET_BRANCH}." >&2
exit 1
fi
elif [ -n "${NEXT_RELEASE:-}" ]; then
TARGET_BRANCH=release${NEXT_RELEASE}-SNAPSHOT
if git rev-parse --verify --quiet "refs/remotes/origin/${TARGET_BRANCH}"; then
echo ""
Expand Down
Loading