diff --git a/CHANGELOG.md b/CHANGELOG.md index 39b3242..94bc23c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] +## [6.9.0] - 2026-06-05 + +### Changed + +- Branch exclusion commands (`checkout_mapl_branch`, `checkout_if_exists`, `checkout_feature_branch_on_fixture_allow_fail`) now also skip feature-branch checkout logic for `release/v*` branches + ## [6.8.0] - 2026-06-02 ### Changed diff --git a/src/commands/checkout_feature_branch_on_fixture_allow_fail.yml b/src/commands/checkout_feature_branch_on_fixture_allow_fail.yml index 8cf6e59..25c4802 100644 --- a/src/commands/checkout_feature_branch_on_fixture_allow_fail.yml +++ b/src/commands/checkout_feature_branch_on_fixture_allow_fail.yml @@ -15,7 +15,7 @@ steps: name: "Checkout branch on fixture on feature, allow failure" command: | cd ${CIRCLE_WORKING_DIRECTORY}/<< parameters.repo >> - if [ "${CIRCLE_BRANCH}" != "develop" ] && [ "${CIRCLE_BRANCH}" != "main" ] + if [ "${CIRCLE_BRANCH}" != "develop" ] && [ "${CIRCLE_BRANCH}" != "main" ] && [[ "${CIRCLE_BRANCH}" != release/v* ]] then git checkout ${CIRCLE_BRANCH} || true fi diff --git a/src/commands/checkout_if_exists.yml b/src/commands/checkout_if_exists.yml index 08caa83..7df411f 100644 --- a/src/commands/checkout_if_exists.yml +++ b/src/commands/checkout_if_exists.yml @@ -12,7 +12,7 @@ steps: command: | cd ${CIRCLE_WORKING_DIRECTORY}/<< parameters.repo >> echo "Branch: ${CIRCLE_BRANCH}" - if [ "${CIRCLE_BRANCH}" != "develop" ] && [ "${CIRCLE_BRANCH}" != "main" ] + if [ "${CIRCLE_BRANCH}" != "develop" ] && [ "${CIRCLE_BRANCH}" != "main" ] && [[ "${CIRCLE_BRANCH}" != release/v* ]] then mepo checkout-if-exists ${CIRCLE_BRANCH} else diff --git a/src/commands/checkout_mapl_branch.yml b/src/commands/checkout_mapl_branch.yml index 9f59c38..103adf5 100644 --- a/src/commands/checkout_mapl_branch.yml +++ b/src/commands/checkout_mapl_branch.yml @@ -26,7 +26,7 @@ steps: fi mepo checkout ${CIRCLE_BRANCH} MAPL - if [ "${CIRCLE_BRANCH}" != "develop" ] && [ "${CIRCLE_BRANCH}" != "main" ] + if [ "${CIRCLE_BRANCH}" != "develop" ] && [ "${CIRCLE_BRANCH}" != "main" ] && [[ "${CIRCLE_BRANCH}" != release/v* ]] then mepo checkout-if-exists ${CIRCLE_BRANCH} fi