From ea89fb58106ab7d56e7935452aee0a1925817f8a Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Sun, 19 Mar 2023 23:42:22 -0400 Subject: [PATCH] feat: ignore release branches in changelog output This change allows us to have an integration branch for each release that contains tested changes for each minor. Rather than have to block merging until a minor is ready for release - and subsequently have to deal with constant rebase issues - we will now have an integration branch per-release. This will be the target for minor-related changes - mostly new features, but also refactors and bc-breaks - while the trunk branch will stay safe for merging patch changes. Note that we'll still need to rebase the integration branch every so often, but at least this allows us to avoid many long-running MRs. --- contrib/release-dokku | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/contrib/release-dokku b/contrib/release-dokku index 44bd725cf..3b5575126 100755 --- a/contrib/release-dokku +++ b/contrib/release-dokku @@ -276,7 +276,9 @@ fn-repo-update-history-and-commit() { TYPE="$(jq -r '.labels[] | select( .name | contains("type") ) | .name' "$ISSUE_FILE" | cut -d' ' -f2)" CHANGELOG_TEXT="- #${PULL_REQUEST_ID}: @${AUTHOR} ${TITLE}" - if [[ "$TYPE" == "bc-break" ]]; then + if [[ "$TYPE" == "release" ]]; then + continue + elif [[ "$TYPE" == "bc-break" ]]; then HISTORY_BC_BREAK="${HISTORY_BC_BREAK}"$'\n'"$CHANGELOG_TEXT" elif [[ "$TYPE" == "bug" ]]; then HISTORY_BUG="${HISTORY_BUG}"$'\n'"$CHANGELOG_TEXT"