From 0b9c8921b49ccb6fbb6820bfe42dab581a755b8e Mon Sep 17 00:00:00 2001
From: Matthew Thompson <matthew.thompson@nasa.gov>
Date: Fri, 5 Jun 2026 09:04:55 -0400
Subject: [PATCH] v5: Update branch exclusion

---
 CHANGELOG.md                                                | 6 ++++++
 .../checkout_feature_branch_on_fixture_allow_fail.yml       | 2 +-
 src/commands/checkout_if_exists.yml                         | 2 +-
 src/commands/checkout_mapl_branch.yml                       | 2 +-
 4 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index afe1fc6..3c2b28d 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]
 
+## [5.30.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
+
 ## [5.29.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