From 02fb6246475899e74fe436a9501b2d9abcc7aada Mon Sep 17 00:00:00 2001 From: Omar Miraj Date: Thu, 1 Aug 2024 11:57:16 -0400 Subject: [PATCH 1/2] Add check to ensure that latest main is acquired --- internal/release/scripts/prep-release.sh | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/internal/release/scripts/prep-release.sh b/internal/release/scripts/prep-release.sh index b62c0694..f725b692 100755 --- a/internal/release/scripts/prep-release.sh +++ b/internal/release/scripts/prep-release.sh @@ -27,6 +27,12 @@ enforce_latest_code() { echo "Please stash your changes and try again." exit 1 fi + git fetch --quiet origin main + if [[ "$(git rev-parse HEAD)" != "$(git rev-parse origin/main)" ]]; then + echo "ERROR: This script was not run from the latest code from origin/main." + echo "Make sure to update your git branch with the latest from main and try again." + exit 1 + fi } # Function to validate the version number format x.y.z(-beta.w) @@ -76,7 +82,7 @@ update_and_validate_build() { done } -# Ensure that the current working directory is clean +# Ensure that the current working directory is clean and release is made of latest main enforce_latest_code # Update and validate the version number From 59bf560b2418cdec108c70466781232bd34e2e3f Mon Sep 17 00:00:00 2001 From: Omar Miraj Date: Thu, 1 Aug 2024 12:04:23 -0400 Subject: [PATCH 2/2] fix comment --- internal/release/scripts/prep-release.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/release/scripts/prep-release.sh b/internal/release/scripts/prep-release.sh index f725b692..57078502 100755 --- a/internal/release/scripts/prep-release.sh +++ b/internal/release/scripts/prep-release.sh @@ -82,7 +82,7 @@ update_and_validate_build() { done } -# Ensure that the current working directory is clean and release is made of latest main +# Ensure that the current working directory is clean and release is made off of latest main enforce_latest_code # Update and validate the version number