Yuxuan 'fishy' Wang | 61698b1 | 2013-12-20 12:55:51 -0800 | [diff] [blame] | 1 | = Making a Gerrit Release |
Martin Fick | 21e278e | 2012-02-23 13:45:54 -0700 | [diff] [blame] | 2 | |
| 3 | [NOTE] |
Martin Fick | 21e278e | 2012-02-23 13:45:54 -0700 | [diff] [blame] | 4 | This document is meant primarily for Gerrit maintainers |
| 5 | who have been given approval and submit status to the Gerrit |
| 6 | projects. Additionally, maintainers should be given owner |
| 7 | status to the Gerrit web site. |
Martin Fick | 21e278e | 2012-02-23 13:45:54 -0700 | [diff] [blame] | 8 | |
| 9 | To make a Gerrit release involves a great deal of complex |
| 10 | tasks and it is easy to miss a step so this document should |
Edwin Kempin | bb8e625 | 2012-07-31 14:30:35 +0200 | [diff] [blame] | 11 | hopefully serve as both a how to for those new to the process |
Martin Fick | 21e278e | 2012-02-23 13:45:54 -0700 | [diff] [blame] | 12 | and as a checklist for those already familiar with these |
| 13 | tasks. |
| 14 | |
| 15 | |
Yuxuan 'fishy' Wang | 61698b1 | 2013-12-20 12:55:51 -0800 | [diff] [blame] | 16 | == Gerrit Release Type |
Martin Fick | 21e278e | 2012-02-23 13:45:54 -0700 | [diff] [blame] | 17 | |
| 18 | Here are some guidelines on release approaches depending on the |
Edwin Kempin | bb8e625 | 2012-07-31 14:30:35 +0200 | [diff] [blame] | 19 | type of release you want to make (`stable-fix`, `stable`, `RC0`, |
| 20 | `RC1`...). |
Martin Fick | 21e278e | 2012-02-23 13:45:54 -0700 | [diff] [blame] | 21 | |
Edwin Kempin | 60ab853 | 2013-03-27 14:33:46 +0100 | [diff] [blame] | 22 | [[stable]] |
Yuxuan 'fishy' Wang | 61698b1 | 2013-12-20 12:55:51 -0800 | [diff] [blame] | 23 | === Stable |
Martin Fick | 21e278e | 2012-02-23 13:45:54 -0700 | [diff] [blame] | 24 | |
Edwin Kempin | bb8e625 | 2012-07-31 14:30:35 +0200 | [diff] [blame] | 25 | A `stable` release is generally built from the `master` branch and may |
| 26 | need to undergo some stabilization before releasing the final release. |
Martin Fick | 21e278e | 2012-02-23 13:45:54 -0700 | [diff] [blame] | 27 | |
| 28 | * Propose the release with any plans/objectives to the mailing list |
| 29 | |
Edwin Kempin | bb8e625 | 2012-07-31 14:30:35 +0200 | [diff] [blame] | 30 | * Create a Gerrit `RC0` |
Martin Fick | 21e278e | 2012-02-23 13:45:54 -0700 | [diff] [blame] | 31 | |
Edwin Kempin | bb8e625 | 2012-07-31 14:30:35 +0200 | [diff] [blame] | 32 | * If needed create a Gerrit `RC1` |
Martin Fick | 21e278e | 2012-02-23 13:45:54 -0700 | [diff] [blame] | 33 | |
| 34 | [NOTE] |
Martin Fick | 21e278e | 2012-02-23 13:45:54 -0700 | [diff] [blame] | 35 | You may let in a few features to this release |
Martin Fick | 21e278e | 2012-02-23 13:45:54 -0700 | [diff] [blame] | 36 | |
Edwin Kempin | bb8e625 | 2012-07-31 14:30:35 +0200 | [diff] [blame] | 37 | * If needed create a Gerrit `RC2` |
Martin Fick | 21e278e | 2012-02-23 13:45:54 -0700 | [diff] [blame] | 38 | |
| 39 | [NOTE] |
Martin Fick | 21e278e | 2012-02-23 13:45:54 -0700 | [diff] [blame] | 40 | There should be no new features in this release, only bug fixes |
Martin Fick | 21e278e | 2012-02-23 13:45:54 -0700 | [diff] [blame] | 41 | |
Edwin Kempin | bb8e625 | 2012-07-31 14:30:35 +0200 | [diff] [blame] | 42 | * Finally create the `stable` release (no `RC`) |
Martin Fick | 21e278e | 2012-02-23 13:45:54 -0700 | [diff] [blame] | 43 | |
| 44 | |
Yuxuan 'fishy' Wang | 61698b1 | 2013-12-20 12:55:51 -0800 | [diff] [blame] | 45 | === Stable-Fix |
Martin Fick | 21e278e | 2012-02-23 13:45:54 -0700 | [diff] [blame] | 46 | |
Edwin Kempin | bb8e625 | 2012-07-31 14:30:35 +0200 | [diff] [blame] | 47 | `stable-fix` releases should likely only contain bug fixes and doc |
| 48 | updates. |
Martin Fick | 21e278e | 2012-02-23 13:45:54 -0700 | [diff] [blame] | 49 | |
Edwin Kempin | a0272a5 | 2012-12-28 10:25:57 +0100 | [diff] [blame] | 50 | * Propose the release with any plans/objectives to the mailing list |
| 51 | |
Edwin Kempin | bb8e625 | 2012-07-31 14:30:35 +0200 | [diff] [blame] | 52 | * This type of release does not need any RCs, release when the |
| 53 | objectives are met |
Martin Fick | 21e278e | 2012-02-23 13:45:54 -0700 | [diff] [blame] | 54 | |
| 55 | |
Edwin Kempin | 60ab853 | 2013-03-27 14:33:46 +0100 | [diff] [blame] | 56 | [[security]] |
Yuxuan 'fishy' Wang | 61698b1 | 2013-12-20 12:55:51 -0800 | [diff] [blame] | 57 | === Security-Fix |
Edwin Kempin | d71591e | 2012-12-28 10:50:38 +0100 | [diff] [blame] | 58 | |
| 59 | `security-fix` releases should only contain bug fixes for security |
| 60 | issues. |
| 61 | |
| 62 | For security issues it is important that they are only announced |
| 63 | *after* fixed versions for all relevant releases have been published. |
David Pursehouse | 452ea4c | 2013-01-07 17:30:47 +0900 | [diff] [blame] | 64 | Because of this, `security-fix` releases can't be prepared in the public |
Edwin Kempin | d71591e | 2012-12-28 10:50:38 +0100 | [diff] [blame] | 65 | `gerrit` project. |
| 66 | |
| 67 | `security-fix` releases are prepared in the `gerrit-security-fixes` |
| 68 | project which is only readable by the Gerrit Maintainers. Only after |
David Pursehouse | 452ea4c | 2013-01-07 17:30:47 +0900 | [diff] [blame] | 69 | a `security-fix` release has been published will the commits/tags made in |
| 70 | the `gerrit-security-fixes` project be taken over into the public |
Edwin Kempin | d71591e | 2012-12-28 10:50:38 +0100 | [diff] [blame] | 71 | `gerrit` project. |
| 72 | |
| 73 | |
Yuxuan 'fishy' Wang | 61698b1 | 2013-12-20 12:55:51 -0800 | [diff] [blame] | 74 | == Create the Actual Release |
Martin Fick | 21e278e | 2012-02-23 13:45:54 -0700 | [diff] [blame] | 75 | |
Edwin Kempin | bb8e625 | 2012-07-31 14:30:35 +0200 | [diff] [blame] | 76 | To create a Gerrit release the following steps have to be done: |
Sasa Zivkov | 619f9ed | 2012-05-25 14:49:29 +0200 | [diff] [blame] | 77 | |
Edwin Kempin | bb8e625 | 2012-07-31 14:30:35 +0200 | [diff] [blame] | 78 | . link:#subproject[Release Subprojects] |
David Pursehouse | 383a318 | 2013-12-06 13:06:57 +0900 | [diff] [blame] | 79 | . link:#build-gerrit[Build the Gerrit Release] |
Edwin Kempin | bb8e625 | 2012-07-31 14:30:35 +0200 | [diff] [blame] | 80 | . link:#publish-gerrit[Publish the Gerrit Release] |
David Pursehouse | dd066e4 | 2015-04-17 17:53:57 +0900 | [diff] [blame] | 81 | .. link:#publish-to-maven-central[Publish the Gerrit artifacts to Maven Central] |
| 82 | .. link:#publish-to-google-storage[Publish the Gerrit WAR to Google Storage] |
Edwin Kempin | bb8e625 | 2012-07-31 14:30:35 +0200 | [diff] [blame] | 83 | .. link:#push-stable[Push the Stable Branch] |
| 84 | .. link:#push-tag[Push the Release Tag] |
| 85 | .. link:#upload-documentation[Upload the Documentation] |
David Pursehouse | d228d6d | 2016-10-19 19:25:35 +0900 | [diff] [blame] | 86 | .. link:#finalize-release-notes[Finalize Release Notes] |
Edwin Kempin | bb8e625 | 2012-07-31 14:30:35 +0200 | [diff] [blame] | 87 | .. link:#update-issues[Update the Issues] |
| 88 | .. link:#announce[Announce on Mailing List] |
| 89 | . link:#increase-version[Increase Gerrit Version for Current Development] |
| 90 | . link:#merge-stable[Merge `stable` into `master`] |
Martin Fick | 21e278e | 2012-02-23 13:45:54 -0700 | [diff] [blame] | 91 | |
| 92 | |
Edwin Kempin | bb8e625 | 2012-07-31 14:30:35 +0200 | [diff] [blame] | 93 | [[subproject]] |
Yuxuan 'fishy' Wang | 61698b1 | 2013-12-20 12:55:51 -0800 | [diff] [blame] | 94 | === Release Subprojects |
Edwin Kempin | bb8e625 | 2012-07-31 14:30:35 +0200 | [diff] [blame] | 95 | |
| 96 | The subprojects to be released are: |
| 97 | |
Edwin Kempin | bb8e625 | 2012-07-31 14:30:35 +0200 | [diff] [blame] | 98 | * `gwtjsonrpc` |
| 99 | * `gwtorm` |
| 100 | * `prolog-cafe` |
| 101 | |
| 102 | For each subproject do: |
| 103 | |
| 104 | * Check the dependency to the Subproject in the Gerrit parent `pom.xml`: |
| 105 | + |
| 106 | If a `SNAPSHOT` version of the subproject is referenced the subproject |
| 107 | needs to be released so that Gerrit can reference a released version of |
| 108 | the subproject. |
| 109 | |
| 110 | * link:dev-release-subproject.html#make-snapshot[Make a snapshot and test it] |
| 111 | * link:dev-release-subproject.html#prepare-release[Prepare the Release] |
| 112 | * link:dev-release-subproject.html#publish-release[Publish the Release] |
| 113 | |
David Ostrovsky | fdbfcad | 2016-11-15 06:35:29 -0800 | [diff] [blame] | 114 | * Update the `artifact`, `sha1`, and `src_sha1` values in the `maven_jar` |
| 115 | for the Subproject in `WORKSPACE` to the released version. |
Edwin Kempin | bb8e625 | 2012-07-31 14:30:35 +0200 | [diff] [blame] | 116 | |
Edwin Kempin | 6ba2194 | 2014-06-03 09:16:20 +0200 | [diff] [blame] | 117 | [[update-versions]] |
| 118 | === Update Versions and Create Release Tag |
| 119 | |
David Pursehouse | 5b42593 | 2015-01-22 16:46:00 +0900 | [diff] [blame] | 120 | Before doing the release build, the `GERRIT_VERSION` in the `VERSION` |
| 121 | file must be updated, e.g. change it from `2.5-SNAPSHOT` to `2.5`. |
Edwin Kempin | 6ba2194 | 2014-06-03 09:16:20 +0200 | [diff] [blame] | 122 | |
| 123 | In addition the version must be updated in a number of pom.xml files. |
David Pursehouse | 5b42593 | 2015-01-22 16:46:00 +0900 | [diff] [blame] | 124 | |
| 125 | To do this run the `./tools/version.py` script and provide the new |
Edwin Kempin | 6ba2194 | 2014-06-03 09:16:20 +0200 | [diff] [blame] | 126 | version as parameter, e.g.: |
| 127 | |
| 128 | ---- |
David Pursehouse | 5b42593 | 2015-01-22 16:46:00 +0900 | [diff] [blame] | 129 | ./tools/version.py 2.5 |
Edwin Kempin | 6ba2194 | 2014-06-03 09:16:20 +0200 | [diff] [blame] | 130 | ---- |
| 131 | |
Saša Živkov | 5f3d397 | 2015-01-28 10:30:49 +0100 | [diff] [blame] | 132 | Commit the changes and create the release tag on the new commit: |
Edwin Kempin | 6ba2194 | 2014-06-03 09:16:20 +0200 | [diff] [blame] | 133 | |
| 134 | ---- |
| 135 | git tag -a v2.5 |
| 136 | ---- |
Edwin Kempin | bb8e625 | 2012-07-31 14:30:35 +0200 | [diff] [blame] | 137 | |
David Pursehouse | a1ab3e7 | 2015-01-30 14:57:11 +0900 | [diff] [blame] | 138 | Tag the plugins: |
| 139 | |
| 140 | ---- |
| 141 | git submodule foreach git tag -a v2.5 |
| 142 | ---- |
| 143 | |
Shawn Pearce | bf8ebbe | 2013-05-06 14:23:26 -0700 | [diff] [blame] | 144 | [[build-gerrit]] |
Yuxuan 'fishy' Wang | 61698b1 | 2013-12-20 12:55:51 -0800 | [diff] [blame] | 145 | === Build Gerrit |
Martin Fick | 21e278e | 2012-02-23 13:45:54 -0700 | [diff] [blame] | 146 | |
Yuxuan 'fishy' Wang | 6714b0d | 2016-05-03 12:58:04 -0700 | [diff] [blame] | 147 | * Build the Gerrit WAR, API JARs and documentation |
Edwin Kempin | bb8e625 | 2012-07-31 14:30:35 +0200 | [diff] [blame] | 148 | + |
David Pursehouse | 383a318 | 2013-12-06 13:06:57 +0900 | [diff] [blame] | 149 | ---- |
David Ostrovsky | fdbfcad | 2016-11-15 06:35:29 -0800 | [diff] [blame] | 150 | bazel build release Documentation:searchfree |
| 151 | ./tools/maven/api.sh install |
David Pursehouse | 383a318 | 2013-12-06 13:06:57 +0900 | [diff] [blame] | 152 | ---- |
Martin Fick | 21e278e | 2012-02-23 13:45:54 -0700 | [diff] [blame] | 153 | |
Edwin Kempin | bb8e625 | 2012-07-31 14:30:35 +0200 | [diff] [blame] | 154 | * Sanity check WAR |
Edwin Kempin | bb8e625 | 2012-07-31 14:30:35 +0200 | [diff] [blame] | 155 | * Test the new Gerrit version |
Martin Fick | 21e278e | 2012-02-23 13:45:54 -0700 | [diff] [blame] | 156 | |
David Pursehouse | 7eb16eb | 2016-03-11 12:01:56 +0900 | [diff] [blame] | 157 | * Verify plugin versions |
| 158 | + |
David Ostrovsky | fdbfcad | 2016-11-15 06:35:29 -0800 | [diff] [blame] | 159 | Verify the versions: |
David Pursehouse | 7eb16eb | 2016-03-11 12:01:56 +0900 | [diff] [blame] | 160 | + |
| 161 | ---- |
David Ostrovsky | fdbfcad | 2016-11-15 06:35:29 -0800 | [diff] [blame] | 162 | java -jar bazel-bin/release.war init --list-plugins |
David Pursehouse | 7eb16eb | 2016-03-11 12:01:56 +0900 | [diff] [blame] | 163 | ---- |
| 164 | |
Edwin Kempin | bb8e625 | 2012-07-31 14:30:35 +0200 | [diff] [blame] | 165 | [[publish-gerrit]] |
Yuxuan 'fishy' Wang | 61698b1 | 2013-12-20 12:55:51 -0800 | [diff] [blame] | 166 | === Publish the Gerrit Release |
Edwin Kempin | bb8e625 | 2012-07-31 14:30:35 +0200 | [diff] [blame] | 167 | |
Edwin Kempin | 210b636 | 2014-06-03 13:33:16 +0200 | [diff] [blame] | 168 | [[publish-to-maven-central]] |
| 169 | ==== Publish the Gerrit artifacts to Maven Central |
| 170 | |
| 171 | * Make sure you have done the |
| 172 | link:dev-release-deploy-config.html#deploy-configuration-setting-maven-central[ |
| 173 | configuration] for deploying to Maven Central |
| 174 | |
David Ostrovsky | fdbfcad | 2016-11-15 06:35:29 -0800 | [diff] [blame] | 175 | * Make sure that the version is updated in the `version.bzl` file and in |
Edwin Kempin | 210b636 | 2014-06-03 13:33:16 +0200 | [diff] [blame] | 176 | the `pom.xml` files as described in the link:#update-versions[Update |
| 177 | Versions and Create Release Tag] section. |
| 178 | |
Edwin Kempin | e5b4943 | 2014-06-03 09:25:39 +0200 | [diff] [blame] | 179 | * Push the WAR to Maven Central: |
| 180 | + |
| 181 | ---- |
David Ostrovsky | fdbfcad | 2016-11-15 06:35:29 -0800 | [diff] [blame] | 182 | ./tools/maven/api.sh war_deploy |
Edwin Kempin | e5b4943 | 2014-06-03 09:25:39 +0200 | [diff] [blame] | 183 | ---- |
Edwin Kempin | bb8e625 | 2012-07-31 14:30:35 +0200 | [diff] [blame] | 184 | |
Edwin Kempin | 210b636 | 2014-06-03 13:33:16 +0200 | [diff] [blame] | 185 | * Push the plugin artifacts to Maven Central: |
Edwin Kempin | bb8e625 | 2012-07-31 14:30:35 +0200 | [diff] [blame] | 186 | + |
| 187 | ---- |
David Ostrovsky | fdbfcad | 2016-11-15 06:35:29 -0800 | [diff] [blame] | 188 | ./tools/maven/api.sh deploy |
Edwin Kempin | 210b636 | 2014-06-03 13:33:16 +0200 | [diff] [blame] | 189 | ---- |
| 190 | |
Edwin Kempin | 210b636 | 2014-06-03 13:33:16 +0200 | [diff] [blame] | 191 | * To where the artifacts are uploaded depends on the `GERRIT_VERSION` in |
David Ostrovsky | fdbfcad | 2016-11-15 06:35:29 -0800 | [diff] [blame] | 192 | the `version.bzl` file: |
Edwin Kempin | 210b636 | 2014-06-03 13:33:16 +0200 | [diff] [blame] | 193 | |
| 194 | ** SNAPSHOT versions are directly uploaded into the Sonatype snapshots |
| 195 | repository and no further action is needed: |
| 196 | + |
| 197 | https://oss.sonatype.org/content/repositories/snapshots/com/google/gerrit/ |
| 198 | |
| 199 | ** Release versions are uploaded into a staging repository in the |
| 200 | link:https://oss.sonatype.org/[Sonatype Nexus Server]. |
| 201 | |
| 202 | * Verify the staging repository |
Edwin Kempin | 210b636 | 2014-06-03 13:33:16 +0200 | [diff] [blame] | 203 | |
| 204 | ** Go to the link:https://oss.sonatype.org/[Sonatype Nexus Server] and |
| 205 | sign in with your Sonatype credentials. |
| 206 | |
Edwin Kempin | 58bc313 | 2014-06-05 14:56:58 +0200 | [diff] [blame] | 207 | ** Click on 'Build Promotion' in the left navigation bar under |
| 208 | 'Staging Repositories' and find the `comgooglegerrit-XXXX` staging |
Edwin Kempin | 210b636 | 2014-06-03 13:33:16 +0200 | [diff] [blame] | 209 | repository. |
| 210 | |
| 211 | ** Verify its content |
| 212 | + |
| 213 | While the staging repository is open you can upload further content and |
| 214 | also replace uploaded artifacts. If something is wrong with the staging |
| 215 | repository you can drop it by selecting it and clicking on `Drop`. |
| 216 | |
| 217 | ** Run Sonatype validations on the staging repository |
| 218 | + |
| 219 | Select the staging repository and click on `Close`. This runs the |
| 220 | Sonatype validations on the staging repository. The repository will |
| 221 | only be closed if everything is OK. A closed repository cannot be |
| 222 | modified anymore, but you may still drop it if you find any issues. |
| 223 | |
| 224 | ** Test closed staging repository |
| 225 | + |
| 226 | Once a repository is closed you can find the URL to it in the `Summary` |
| 227 | section, e.g. https://oss.sonatype.org/content/repositories/comgooglegerrit-1029 |
| 228 | + |
| 229 | Use this URL for further testing of the artifacts in this repository, |
| 230 | e.g. to try building a plugin against the plugin API in this repository |
| 231 | update the version in the `pom.xml` and configure the repository: |
| 232 | + |
| 233 | ---- |
| 234 | <repositories> |
| 235 | <repository> |
| 236 | <id>gerrit-staging-repository</id> |
| 237 | <url>https://oss.sonatype.org/content/repositories/comgooglegerrit-1029</url> |
| 238 | </repository> |
| 239 | </repositories> |
| 240 | ---- |
| 241 | |
| 242 | * Release the staging repository |
| 243 | + |
| 244 | How to release a staging repository is described in the |
| 245 | link:https://docs.sonatype.org/display/Repository/Sonatype+OSS+Maven+Repository+Usage+Guide#SonatypeOSSMavenRepositoryUsageGuide-8.a.2.ReleasingaStagingRepository[ |
| 246 | Sonatype OSS Maven Repository Usage Guide]. |
| 247 | + |
| 248 | [WARNING] |
| 249 | Releasing artifacts to Maven Central cannot be undone! |
| 250 | |
| 251 | ** Find the closed staging repository in the |
| 252 | link:https://oss.sonatype.org/[Sonatype Nexus Server], select it and |
| 253 | click on `Release`. |
| 254 | |
Edwin Kempin | 8e63cf4 | 2014-06-04 14:24:20 +0200 | [diff] [blame] | 255 | ** The released artifacts are available in |
| 256 | https://oss.sonatype.org/content/repositories/releases/com/google/gerrit/ |
| 257 | |
Edwin Kempin | 210b636 | 2014-06-03 13:33:16 +0200 | [diff] [blame] | 258 | ** It may take up to 2 hours until the artifacts appear on Maven |
| 259 | Central: |
| 260 | + |
Edwin Kempin | 8e63cf4 | 2014-06-04 14:24:20 +0200 | [diff] [blame] | 261 | http://central.maven.org/maven2/com/google/gerrit/ |
Edwin Kempin | bb8e625 | 2012-07-31 14:30:35 +0200 | [diff] [blame] | 262 | |
Edwin Kempin | 58bc313 | 2014-06-05 14:56:58 +0200 | [diff] [blame] | 263 | * [optional]: View download statistics |
| 264 | |
| 265 | ** Sign in to the |
| 266 | link:https://oss.sonatype.org/[Sonatype Nexus Server]. |
| 267 | |
| 268 | ** Click on 'Views/Repositories' in the left navigation bar under |
| 269 | 'Central Statistics'. |
| 270 | |
| 271 | ** Select `com.google.gerrit` as `Project`. |
| 272 | |
Martin Fick | 21e278e | 2012-02-23 13:45:54 -0700 | [diff] [blame] | 273 | |
David Pursehouse | dd066e4 | 2015-04-17 17:53:57 +0900 | [diff] [blame] | 274 | [[publish-to-google-storage]] |
| 275 | ==== Publish the Gerrit WAR to the Google Cloud Storage |
| 276 | |
David Pursehouse | af652ab | 2016-08-29 16:37:22 +0900 | [diff] [blame] | 277 | * go to the link:https://console.cloud.google.com/storage/browser/gerrit-releases/?project=api-project-164060093628[ |
| 278 | gerrit-releases bucket in the Google cloud storage console] |
David Pursehouse | dd066e4 | 2015-04-17 17:53:57 +0900 | [diff] [blame] | 279 | * make sure you are signed in with your Gmail account |
| 280 | * manually upload the Gerrit WAR file by using the `Upload` button |
| 281 | |
Edwin Kempin | bb8e625 | 2012-07-31 14:30:35 +0200 | [diff] [blame] | 282 | [[push-stable]] |
Yuxuan 'fishy' Wang | 61698b1 | 2013-12-20 12:55:51 -0800 | [diff] [blame] | 283 | ==== Push the Stable Branch |
Martin Fick | 21e278e | 2012-02-23 13:45:54 -0700 | [diff] [blame] | 284 | |
David Pursehouse | 0c10402 | 2014-06-02 09:57:14 +0900 | [diff] [blame] | 285 | * Create the stable branch `stable-2.5` in the `gerrit` project via the |
| 286 | link:https://gerrit-review.googlesource.com/#/admin/projects/gerrit,branches[ |
David Pursehouse | a1d633b | 2014-05-02 17:21:02 +0900 | [diff] [blame] | 287 | Gerrit Web UI] or by push. |
Edwin Kempin | bb8e625 | 2012-07-31 14:30:35 +0200 | [diff] [blame] | 288 | |
| 289 | * Push the commits done on `stable-2.5` to `refs/for/stable-2.5` and |
| 290 | get them merged |
| 291 | |
| 292 | |
| 293 | [[push-tag]] |
Yuxuan 'fishy' Wang | 61698b1 | 2013-12-20 12:55:51 -0800 | [diff] [blame] | 294 | ==== Push the Release Tag |
Edwin Kempin | bb8e625 | 2012-07-31 14:30:35 +0200 | [diff] [blame] | 295 | |
David Pursehouse | a1ab3e7 | 2015-01-30 14:57:11 +0900 | [diff] [blame] | 296 | Push the new Release Tag: |
| 297 | |
David Pursehouse | 383a318 | 2013-12-06 13:06:57 +0900 | [diff] [blame] | 298 | ---- |
Saša Živkov | ffd288e | 2015-01-28 12:22:37 +0100 | [diff] [blame] | 299 | git push gerrit-review tag v2.5 |
David Pursehouse | 383a318 | 2013-12-06 13:06:57 +0900 | [diff] [blame] | 300 | ---- |
Martin Fick | 21e278e | 2012-02-23 13:45:54 -0700 | [diff] [blame] | 301 | |
David Pursehouse | a1ab3e7 | 2015-01-30 14:57:11 +0900 | [diff] [blame] | 302 | Push the new Release Tag on the plugins: |
| 303 | |
| 304 | ---- |
| 305 | git submodule foreach git push gerrit-review tag v2.5 |
| 306 | ---- |
| 307 | |
Martin Fick | 21e278e | 2012-02-23 13:45:54 -0700 | [diff] [blame] | 308 | |
Edwin Kempin | bb8e625 | 2012-07-31 14:30:35 +0200 | [diff] [blame] | 309 | [[upload-documentation]] |
Yuxuan 'fishy' Wang | 61698b1 | 2013-12-20 12:55:51 -0800 | [diff] [blame] | 310 | ==== Upload the Documentation |
Martin Fick | 21e278e | 2012-02-23 13:45:54 -0700 | [diff] [blame] | 311 | |
Yuxuan 'fishy' Wang | 6714b0d | 2016-05-03 12:58:04 -0700 | [diff] [blame] | 312 | * Extract the documentation files from the zip file generated from |
David Ostrovsky | fdbfcad | 2016-11-15 06:35:29 -0800 | [diff] [blame] | 313 | `bazel build searchfree`: `bazel-bin/Documentation/searchfree.zip`. |
David Pursehouse | db62816 | 2014-12-09 19:33:01 +0900 | [diff] [blame] | 314 | |
David Pursehouse | 62106ac | 2016-03-11 14:19:48 +0900 | [diff] [blame] | 315 | * Upload the files manually via web browser to the appropriate folder |
| 316 | in the |
David Pursehouse | af652ab | 2016-08-29 16:37:22 +0900 | [diff] [blame] | 317 | link:https://console.cloud.google.com/storage/browser/gerrit-documentation/?project=api-project-164060093628[ |
David Pursehouse | a8dca2f | 2015-04-17 13:59:29 +0900 | [diff] [blame] | 318 | gerrit-documentation] storage bucket. |
Yuxuan 'fishy' Wang | f780397 | 2014-09-03 12:23:21 -0700 | [diff] [blame] | 319 | |
David Pursehouse | d228d6d | 2016-10-19 19:25:35 +0900 | [diff] [blame] | 320 | [[finalize-release-notes]] |
| 321 | === Finalize the Release Notes |
| 322 | |
| 323 | Upload a change on the homepage project to: |
| 324 | |
| 325 | * Remove 'In Development' caveat from the relevant section. |
| 326 | |
| 327 | * Add links to the released documentation and the .war file, and make the |
| 328 | latest version bold. |
| 329 | |
David Pursehouse | db62816 | 2014-12-09 19:33:01 +0900 | [diff] [blame] | 330 | [[update-links]] |
David Pursehouse | 08726a8 | 2015-07-14 11:46:20 +0900 | [diff] [blame] | 331 | ==== Update homepage links |
Yuxuan 'fishy' Wang | f780397 | 2014-09-03 12:23:21 -0700 | [diff] [blame] | 332 | |
David Pursehouse | 08726a8 | 2015-07-14 11:46:20 +0900 | [diff] [blame] | 333 | Upload a change on the link:https://gerrit-review.googlesource.com/#/admin/projects/homepage[ |
| 334 | homepage project] to change the version numbers to the new version. |
Martin Fick | 21e278e | 2012-02-23 13:45:54 -0700 | [diff] [blame] | 335 | |
Edwin Kempin | bb8e625 | 2012-07-31 14:30:35 +0200 | [diff] [blame] | 336 | [[update-issues]] |
Yuxuan 'fishy' Wang | 61698b1 | 2013-12-20 12:55:51 -0800 | [diff] [blame] | 337 | ==== Update the Issues |
Martin Fick | 21e278e | 2012-02-23 13:45:54 -0700 | [diff] [blame] | 338 | |
Michael Ochmann | b99feab | 2016-07-06 14:10:22 +0200 | [diff] [blame] | 339 | Update the issues by hand. There is no script for this. |
Martin Fick | 21e278e | 2012-02-23 13:45:54 -0700 | [diff] [blame] | 340 | |
Edwin Kempin | bb8e625 | 2012-07-31 14:30:35 +0200 | [diff] [blame] | 341 | Our current process is an issue should be updated to say `Status = |
| 342 | Submitted, FixedIn-2.5` once the change is submitted, but before the |
Martin Fick | 21e278e | 2012-02-23 13:45:54 -0700 | [diff] [blame] | 343 | release. |
| 344 | |
| 345 | After the release is actually made, you can search in Google Code for |
Michael Ochmann | b99feab | 2016-07-06 14:10:22 +0200 | [diff] [blame] | 346 | `Status=Submitted FixedIn=2.5` and then batch update these changes |
| 347 | to say `Status=Released`. Make sure the pulldown says `All Issues` |
Edwin Kempin | bb8e625 | 2012-07-31 14:30:35 +0200 | [diff] [blame] | 348 | because `Status=Submitted` is considered a closed issue. |
Martin Fick | 21e278e | 2012-02-23 13:45:54 -0700 | [diff] [blame] | 349 | |
| 350 | |
Edwin Kempin | bb8e625 | 2012-07-31 14:30:35 +0200 | [diff] [blame] | 351 | [[announce]] |
Yuxuan 'fishy' Wang | 61698b1 | 2013-12-20 12:55:51 -0800 | [diff] [blame] | 352 | ==== Announce on Mailing List |
Martin Fick | 21e278e | 2012-02-23 13:45:54 -0700 | [diff] [blame] | 353 | |
Edwin Kempin | bb8e625 | 2012-07-31 14:30:35 +0200 | [diff] [blame] | 354 | * Send an email to the mailing list to announce the release, consider |
| 355 | including some or all of the following in the email: |
David Pursehouse | d228d6d | 2016-10-19 19:25:35 +0900 | [diff] [blame] | 356 | ** A link to the release and the release notes |
Martin Fick | 21e278e | 2012-02-23 13:45:54 -0700 | [diff] [blame] | 357 | ** A link to the docs |
| 358 | ** Describe the type of release (stable, bug fix, RC) |
David Pursehouse | aee79e1 | 2016-03-11 13:02:26 +0900 | [diff] [blame] | 359 | ** Hash values (SHA1, SHA256, MD5) for the release WAR file. |
| 360 | + |
| 361 | The SHA1 and MD5 can be taken from the artifact page on Sonatype. The |
| 362 | SHA256 can be generated with |
David Ostrovsky | fdbfcad | 2016-11-15 06:35:29 -0800 | [diff] [blame] | 363 | `openssl sha -sha256 bazel-bin/release.war` or an equivalent |
David Pursehouse | aee79e1 | 2016-03-11 13:02:26 +0900 | [diff] [blame] | 364 | command. |
Martin Fick | 21e278e | 2012-02-23 13:45:54 -0700 | [diff] [blame] | 365 | |
Martin Fick | d377ebf | 2012-06-23 12:10:43 -0600 | [diff] [blame] | 366 | * Update the new discussion group announcement to be sticky |
| 367 | ** Go to: http://groups.google.com/group/repo-discuss/topics |
| 368 | ** Click on the announcement thread |
Saša Živkov | c03196d | 2015-01-28 12:26:11 +0100 | [diff] [blame] | 369 | ** Near the top right, click on actions |
| 370 | ** Under actions, click the "Display this top first" checkbox |
Martin Fick | d377ebf | 2012-06-23 12:10:43 -0600 | [diff] [blame] | 371 | |
| 372 | * Update the previous discussion group announcement to no longer be sticky |
| 373 | ** See above (unclick checkbox) |
| 374 | |
Martin Fick | 21e278e | 2012-02-23 13:45:54 -0700 | [diff] [blame] | 375 | |
Edwin Kempin | bb8e625 | 2012-07-31 14:30:35 +0200 | [diff] [blame] | 376 | [[increase-version]] |
Yuxuan 'fishy' Wang | 61698b1 | 2013-12-20 12:55:51 -0800 | [diff] [blame] | 377 | === Increase Gerrit Version for Current Development |
Martin Fick | 21e278e | 2012-02-23 13:45:54 -0700 | [diff] [blame] | 378 | |
David Pursehouse | f7c9f2c | 2014-12-09 19:36:04 +0900 | [diff] [blame] | 379 | All new development that is done in the `master` branch will be included in the |
| 380 | next Gerrit release. The Gerrit version should be set to the snapshot version |
| 381 | for the next release. |
Edwin Kempin | bb8e625 | 2012-07-31 14:30:35 +0200 | [diff] [blame] | 382 | |
David Ostrovsky | fdbfcad | 2016-11-15 06:35:29 -0800 | [diff] [blame] | 383 | Use the `version` tool to set the version in the `version.bzl` file: |
David Pursehouse | f7c9f2c | 2014-12-09 19:36:04 +0900 | [diff] [blame] | 384 | |
| 385 | ---- |
| 386 | ./tools/version.py 2.11-SNAPSHOT |
| 387 | ---- |
| 388 | |
| 389 | Verify that the changes made by the tool are sane, then commit them, push |
| 390 | the change for review on the master branch, and get it merged. |
Edwin Kempin | bb8e625 | 2012-07-31 14:30:35 +0200 | [diff] [blame] | 391 | |
| 392 | [[merge-stable]] |
Yuxuan 'fishy' Wang | 61698b1 | 2013-12-20 12:55:51 -0800 | [diff] [blame] | 393 | === Merge `stable` into `master` |
Edwin Kempin | bb8e625 | 2012-07-31 14:30:35 +0200 | [diff] [blame] | 394 | |
| 395 | After every release, stable should be merged to master to ensure that |
| 396 | none of the changes/fixes ever get lost. |
Martin Fick | 21e278e | 2012-02-23 13:45:54 -0700 | [diff] [blame] | 397 | |
David Pursehouse | 383a318 | 2013-12-06 13:06:57 +0900 | [diff] [blame] | 398 | ---- |
| 399 | git config merge.summary true |
| 400 | git checkout master |
| 401 | git reset --hard origin/master |
| 402 | git branch -f stable origin/stable |
| 403 | git merge stable |
| 404 | ---- |
Martin Fick | ec31ff4 | 2012-06-23 11:35:39 -0600 | [diff] [blame] | 405 | |
| 406 | |
| 407 | GERRIT |
| 408 | ------ |
| 409 | Part of link:index.html[Gerrit Code Review] |
Yuxuan 'fishy' Wang | 99cb68d | 2013-10-31 17:26:00 -0700 | [diff] [blame] | 410 | |
| 411 | SEARCHBOX |
| 412 | --------- |