From 6a8cc49d46114f611138b65c2557dff10203d52d Mon Sep 17 00:00:00 2001 From: Devin Smith Date: Tue, 28 Nov 2023 14:46:49 -0800 Subject: [PATCH] Fix github action release versioning (#4886) This removes the -SNAPSHOT qualifier for all github action release branch gradle invocations. This also makes a point to update the RELEASE.md in the one place where the release manager invokes gradlew. Follow-up fix for #4865 --- .github/scripts/gradle-properties.sh | 6 ++++++ .github/workflows/publish-ci.yml | 1 - RELEASE.md | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/.github/scripts/gradle-properties.sh b/.github/scripts/gradle-properties.sh index d271ad29f0c..88f00dce804 100755 --- a/.github/scripts/gradle-properties.sh +++ b/.github/scripts/gradle-properties.sh @@ -48,3 +48,9 @@ org.gradle.java.installations.auto-detect=false org.gradle.workers.max=${MAX_WORKERS} org.gradle.java.installations.paths=${JAVA_INSTALL_PATHS} EOF + +# Ensure we remove the -SNAPSHOT qualifier for release branch workflows +if [[ "${GITHUB_REF}" == refs/heads/release/v* ]]; +then + echo "deephavenBaseQualifier=" +fi diff --git a/.github/workflows/publish-ci.yml b/.github/workflows/publish-ci.yml index a830c33343a..debbeb3dde8 100644 --- a/.github/workflows/publish-ci.yml +++ b/.github/workflows/publish-ci.yml @@ -63,7 +63,6 @@ jobs: ORG_GRADLE_PROJECT_signingKey: ${{ secrets.CI_AT_DEEPHAVEN_KEY }} ORG_GRADLE_PROJECT_signingPassword: ${{ secrets.CI_AT_DEEPHAVEN_PASSWORD }} ORG_GRADLE_PROJECT_signingRequired: true - ORG_GRADLE_PROJECT_deephavenBaseQualifier: "" - name: Upload Artifacts if: ${{ startsWith(github.ref, 'refs/heads/release/v') }} diff --git a/RELEASE.md b/RELEASE.md index a5492ae078e..4b07e23da42 100644 --- a/RELEASE.md +++ b/RELEASE.md @@ -96,7 +96,7 @@ We also separate out the release branch from `upstream/main` with an empty commi ```shell $ git fetch upstream $ git checkout upstream/main -$ ./gradlew printVersion -q +$ ./gradlew printVersion -PdeephavenBaseQualifier= -q $ git checkout -b release/vX.Y.Z $ git commit --allow-empty -m "Cut for X.Y.Z" ```