Skip to content

Commit

Permalink
Fix github action release versioning (#4886)
Browse files Browse the repository at this point in the history
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
  • Loading branch information
devinrsmith authored Nov 28, 2023
1 parent e09bcfd commit 6a8cc49
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 2 deletions.
6 changes: 6 additions & 0 deletions .github/scripts/gradle-properties.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
1 change: 0 additions & 1 deletion .github/workflows/publish-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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') }}
Expand Down
2 changes: 1 addition & 1 deletion RELEASE.md
Original file line number Diff line number Diff line change
Expand Up @@ -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"
```
Expand Down

0 comments on commit 6a8cc49

Please sign in to comment.