This is an automated email from the ASF dual-hosted git repository. cwylie pushed a commit to branch clintropolis-patch-1 in repository https://gitbox.apache.org/repos/asf/druid.git
commit b7d789c7ee6576b1d26347c0e13c22418c18e760 Author: Clint Wylie <[email protected]> AuthorDate: Sun Jul 12 03:50:36 2020 -0700 update release process guide to include web-console versions --- distribution/asf-release-process-guide.md | 37 ++++++++++++++++++++++++++++--- 1 file changed, 34 insertions(+), 3 deletions(-) diff --git a/distribution/asf-release-process-guide.md b/distribution/asf-release-process-guide.md index 6431eb7..41798ea 100644 --- a/distribution/asf-release-process-guide.md +++ b/distribution/asf-release-process-guide.md @@ -39,15 +39,31 @@ $ git checkout origin/master $ git checkout -b 0.17.0 ``` -Then push the branch to `origin`. If doing a quarterly release, it will also be necessary to bump the version in master to the next release snapshot: +Then push the branch to `origin`. + +#### Preparing the master branch for the next version after branching +If doing a quarterly release, it will also be necessary to prepare master for the release _after_ the release you are working on, by setting the version to the next release snapshot: ```bash $ mvn versions:set -DnewVersion=0.18.0-SNAPSHOT ``` -and open a PR to the master branch. Bug fix releases should already have the correct snapshot version from the previous releases on the branch, so this step is not necessary. +You should also prepare the web-console for the next release, by bumping the [package.json](../web-console/package.json) and [package-lock.json](../web-console/package-lock.json) version: + +```bash +npm version 0.18.0 +``` +and update the script tag top level html file, [unified-console.html](../web-console/unified-console.html): + +```html +<script src="public/web-console-0.18.0.js"></script> +``` + +and open a PR to the master branch. + +### Release branch hygiene -The only additions to the release branch after this branch should be bug fixes, which should be back-ported from the master branch, via a second PR, not with a direct PR to the release branch. Bug fix release branches may be initially populated via cherry-picking, but it is recommended to leave at least 1 commit to do as a backport PR in order to run through CI. (Note that CI is sometimes flaky for older branches). +The only additions to the release branch after branching should be bug fixes, which should be back-ported from the master branch, via a second PR, not with a direct PR to the release branch. Bug fix release branches may be initially populated via cherry-picking, but it is recommended to leave at least 1 commit to do as a backport PR in order to run through CI. (Note that CI is sometimes flaky for older branches). Once all issues and PRs that are still tagged with the release milestone have been merged, closed, or removed from the milestone, the next step is to put together a release candidate. @@ -183,6 +199,21 @@ It is also the release managers responsibility for correctly assigning all PRs m Next create an issue in the Druid github to contain the release notes and allow the community to provide feedback prior to the release. Make sure to attach it to the release milestone in github. It is highly recommended to review [previous release notes for reference](https://github.com/apache/druid/releases) of how to best structure them. Be sure to call out any exciting new features, important bug fixes, and any compatibility concerns for users or operators to consider when upgrading t [...] +## Web console package version +Make sure the web console Javascript package version matches the upcoming release version prior to making tags and artifacts. You can find the release version in [package.json](../web-console/package.json). This should be set correctly, but if it isn't, it can be set with: + +```bash +npm version 0.17.0 +``` + +which will update `package.json` and `package-lock.json`. + +You will also need to manually update the top level html file, [unified-console.html](../web-console/unified-console.html), to ensure that the Javascript script tag is set to match the package.json version. + +```html +<script src="public/web-console-0.17.0.js"></script> +``` + ## Building a release candidate --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
