From 2e8aeb002f91c3f9693ba7400f750f721b831bb8 Mon Sep 17 00:00:00 2001 From: "slav.babanin" Date: Thu, 31 Oct 2024 16:45:10 -0700 Subject: [PATCH 1/3] Change branch name to main in SSDLC script. --- .evergreen/ssdlc-report.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.evergreen/ssdlc-report.sh b/.evergreen/ssdlc-report.sh index 2958edb4327..e674d9fb2fa 100755 --- a/.evergreen/ssdlc-report.sh +++ b/.evergreen/ssdlc-report.sh @@ -40,7 +40,7 @@ declare -r EVERGREEN_BUILD_URL_PREFIX="https://spruce.mongodb.com/version" declare -r GIT_TAG="r${PRODUCT_VERSION}" GIT_COMMIT_HASH="$(git rev-list --ignore-missing -n 1 "${GIT_TAG}")" set +e - GIT_BRANCH_MASTER="$(git branch -a --contains "${GIT_TAG}" | grep 'master$')" + GIT_BRANCH_MASTER="$(git branch -a --contains "${GIT_TAG}" | grep 'main')" GIT_BRANCH_PATCH="$(git branch -a --contains "${GIT_TAG}" | grep '\.x$')" set -e if [ -n "${GIT_BRANCH_MASTER}" ]; then From d37419e56bce0cf25d04c9228d888c4424d9be60 Mon Sep 17 00:00:00 2001 From: "slav.babanin" Date: Thu, 31 Oct 2024 16:46:20 -0700 Subject: [PATCH 2/3] Fix CLI command. --- .evergreen/ssdlc-report.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.evergreen/ssdlc-report.sh b/.evergreen/ssdlc-report.sh index e674d9fb2fa..cda4f595c37 100755 --- a/.evergreen/ssdlc-report.sh +++ b/.evergreen/ssdlc-report.sh @@ -40,7 +40,7 @@ declare -r EVERGREEN_BUILD_URL_PREFIX="https://spruce.mongodb.com/version" declare -r GIT_TAG="r${PRODUCT_VERSION}" GIT_COMMIT_HASH="$(git rev-list --ignore-missing -n 1 "${GIT_TAG}")" set +e - GIT_BRANCH_MASTER="$(git branch -a --contains "${GIT_TAG}" | grep 'main')" + GIT_BRANCH_MASTER="$(git branch -a --contains "${GIT_TAG}" | grep 'main$')" GIT_BRANCH_PATCH="$(git branch -a --contains "${GIT_TAG}" | grep '\.x$')" set -e if [ -n "${GIT_BRANCH_MASTER}" ]; then From 86ed418e8bcd1abd112b2fc0d345d6ae089bf087 Mon Sep 17 00:00:00 2001 From: "slav.babanin" Date: Fri, 15 Nov 2024 13:28:06 -0800 Subject: [PATCH 3/3] Rename default branch variable. --- .evergreen/ssdlc-report.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.evergreen/ssdlc-report.sh b/.evergreen/ssdlc-report.sh index cda4f595c37..88b796e6328 100755 --- a/.evergreen/ssdlc-report.sh +++ b/.evergreen/ssdlc-report.sh @@ -40,10 +40,10 @@ declare -r EVERGREEN_BUILD_URL_PREFIX="https://spruce.mongodb.com/version" declare -r GIT_TAG="r${PRODUCT_VERSION}" GIT_COMMIT_HASH="$(git rev-list --ignore-missing -n 1 "${GIT_TAG}")" set +e - GIT_BRANCH_MASTER="$(git branch -a --contains "${GIT_TAG}" | grep 'main$')" + GIT_BRANCH_DEFAULT="$(git branch -a --contains "${GIT_TAG}" | grep 'main$')" GIT_BRANCH_PATCH="$(git branch -a --contains "${GIT_TAG}" | grep '\.x$')" set -e -if [ -n "${GIT_BRANCH_MASTER}" ]; then +if [ -n "${GIT_BRANCH_DEFAULT}" ]; then declare -r EVERGREEN_BUILD_URL="${EVERGREEN_BUILD_URL_PREFIX}/${EVERGREEN_PROJECT_NAME_PREFIX}_${GIT_COMMIT_HASH}" elif [ -n "${GIT_BRANCH_PATCH}" ]; then # strip out the patch version