Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix github action release versioning #4886

Merged
merged 1 commit into from
Nov 28, 2023
Merged

Fix github action release versioning #4886

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions .github/scripts/gradle-properties.sh
View file
Open in desktop
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
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Does this also fix gradlew "outputVersion"?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yes

1 change: 0 additions & 1 deletion .github/workflows/publish-ci.yml
View file
Open in desktop
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
View file
Open in desktop
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
Loading