From a6281150b2ddbfdf5df943ed8c96fbedac16a149 Mon Sep 17 00:00:00 2001 From: James Daugherty Date: Tue, 18 Mar 2025 12:04:24 -0400 Subject: [PATCH 1/2] Export variables so release scripts can access any initialized variable --- post-release/entrypoint.sh | 4 ++-- pre-release/entrypoint.sh | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/post-release/entrypoint.sh b/post-release/entrypoint.sh index 921aa25..a7ce2e1 100755 --- a/post-release/entrypoint.sh +++ b/post-release/entrypoint.sh @@ -40,7 +40,7 @@ set_value_or_error() { fi fi - eval "$variableName=\"\$decidedValue\"" + eval "export $variableName=\"\$decidedValue\"" } set -e @@ -53,7 +53,7 @@ set_value_or_error "${GITHUB_REPOSITORY}" "" "GITHUB_REPOSITORY" set_value_or_error "${RELEASE_VERSION}" "${GITHUB_REF:11}" "RELEASE_VERSION" if [[ ! "$VERSION" =~ ^v?[^.]+\.[^.]+\.[^.]+$ ]]; then - echo "ERROR: VERSION must be in the format 'X.X.X' or 'vX.X.X'. Got: '$VERSION'" + echo "ERROR: RELEASE_VERSION must be in the format 'X.X.X' or 'vX.X.X'. Got: '${RELEASE_VERSION}'" exit 1 fi if [[ "${RELEASE_VERSION}" == v* ]]; then diff --git a/pre-release/entrypoint.sh b/pre-release/entrypoint.sh index 7068248..cef0794 100755 --- a/pre-release/entrypoint.sh +++ b/pre-release/entrypoint.sh @@ -39,14 +39,15 @@ set_value_or_error() { fi fi - eval "$variableName=\"\$decidedValue\"" + # Export the variable so all variables are available in third party scripts + eval "export $variableName=\"\$decidedValue\"" } set -e set_value_or_error "${RELEASE_VERSION}" "${GITHUB_REF:11}" "RELEASE_VERSION" if [[ ! "$VERSION" =~ ^v?[^.]+\.[^.]+\.[^.]+$ ]]; then - echo "ERROR: VERSION must be in the format 'X.X.X' or 'vX.X.X'. Got: '${RELEASE_VERSION}'" + echo "ERROR: RELEASE_VERSION must be in the format 'X.X.X' or 'vX.X.X'. Got: '${RELEASE_VERSION}'" exit 1 fi if [[ "${RELEASE_VERSION}" == v* ]]; then From 54a9b7cba38816c383da5ee2679706e1fa0d8b52 Mon Sep 17 00:00:00 2001 From: James Daugherty Date: Wed, 19 Mar 2025 10:07:41 -0400 Subject: [PATCH 2/2] fix: variable names --- post-release/entrypoint.sh | 2 +- pre-release/entrypoint.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/post-release/entrypoint.sh b/post-release/entrypoint.sh index a7ce2e1..8e5a2cf 100755 --- a/post-release/entrypoint.sh +++ b/post-release/entrypoint.sh @@ -52,7 +52,7 @@ set_value_or_error "${GITHUB_WORKSPACE}" "." "GIT_SAFE_DIR" set_value_or_error "${GITHUB_REPOSITORY}" "" "GITHUB_REPOSITORY" set_value_or_error "${RELEASE_VERSION}" "${GITHUB_REF:11}" "RELEASE_VERSION" -if [[ ! "$VERSION" =~ ^v?[^.]+\.[^.]+\.[^.]+$ ]]; then +if [[ ! "${RELEASE_VERSION}" =~ ^v?[^.]+\.[^.]+\.[^.]+$ ]]; then echo "ERROR: RELEASE_VERSION must be in the format 'X.X.X' or 'vX.X.X'. Got: '${RELEASE_VERSION}'" exit 1 fi diff --git a/pre-release/entrypoint.sh b/pre-release/entrypoint.sh index cef0794..4ad073d 100755 --- a/pre-release/entrypoint.sh +++ b/pre-release/entrypoint.sh @@ -46,7 +46,7 @@ set_value_or_error() { set -e set_value_or_error "${RELEASE_VERSION}" "${GITHUB_REF:11}" "RELEASE_VERSION" -if [[ ! "$VERSION" =~ ^v?[^.]+\.[^.]+\.[^.]+$ ]]; then +if [[ ! "${RELEASE_VERSION}" =~ ^v?[^.]+\.[^.]+\.[^.]+$ ]]; then echo "ERROR: RELEASE_VERSION must be in the format 'X.X.X' or 'vX.X.X'. Got: '${RELEASE_VERSION}'" exit 1 fi