diff options
author | Eric Anderson <ejona@google.com> | 2017-05-18 10:10:44 -0700 |
---|---|---|
committer | Eric Anderson <ejona@google.com> | 2017-07-07 17:11:16 -0700 |
commit | 1331abb3269aa94341bbd61110db331e6ec14c82 (patch) | |
tree | 89495cfb4bc86d80eba1164899aab44445a903a0 /RELEASING.md | |
parent | 4b9c83f97826838407e53a72b21b755ae7cd1c60 (diff) | |
download | grpc-grpc-java-1331abb3269aa94341bbd61110db331e6ec14c82.tar.gz |
releasing: Move CI config to just after branch creation
Diffstat (limited to 'RELEASING.md')
-rw-r--r-- | RELEASING.md | 54 |
1 files changed, 27 insertions, 27 deletions
diff --git a/RELEASING.md b/RELEASING.md index bc30952dd..cd7b4fa36 100644 --- a/RELEASING.md +++ b/RELEASING.md @@ -78,7 +78,28 @@ would be used to create all `v0.7` tags (e.g. `v0.7.0`, `v0.7.1`). $ git checkout -b v$MAJOR.$MINOR.x master $ git push upstream v$MAJOR.$MINOR.x ``` -2. For `master`, change root build files to the next minor snapshot (e.g. +2. Make sure you are [logged in](https://grpc-testing.appspot.com/manage) to + Jenkins, then make a [new release + job](https://grpc-testing.appspot.com/view/Releases/newJob) + * _Name_: gRPC-Java-$MAJOR.$MINOR-Windows + * _Copy from_: gRPC-Java-master-windows + * Click _OK_ button + * _Display Name_ under _Use custom workspace_ (not ~~Project + url~~): gRPC Java $MAJOR.$MINOR Windows + * Under _Source Code Management_, _Branches to build_'s + _Branch Specifier_: `*/v$MAJOR.$MINOR.x` + * Under _Build Triggers_, _Build periodically_: `H H * * H` + * Click _SAVE_ button + * Click _Build Now_ + * Click on job #1, then _Console Output_. Verify the `git checkout` checked + out the correct commit +3. Go to [Travis CI settings](https://travis-ci.org/grpc/grpc-java/settings) and + add a _Cron Job_: + * Branch: `v$MAJOR.$MINOR.x` + * Interval: `weekly` + * Options: `Do not run if there has been a build in the last 24h` + * Click _Add_ button +4. For `master`, change root build files to the next minor snapshot (e.g. ``0.8.0-SNAPSHOT``). ```bash @@ -89,14 +110,14 @@ would be used to create all `v0.7` tags (e.g. `v0.7.0`, `v0.7.1`). $ ./gradlew build $ git commit -a -m "Start $MAJOR.$((MINOR+1)).0 development cycle" ``` -3. Go through PR review and push the master branch to GitHub: +5. Go through PR review and push the master branch to GitHub: ```bash $ git checkout master $ git merge --ff-only bump-version $ git push upstream master ``` -4. For vMajor.Minor.x branch, change `README.md` to refer to the next release +6. For vMajor.Minor.x branch, change `README.md` to refer to the next release version. _Also_ update the version numbers for protoc if the protobuf library version was updated since the last release. @@ -106,7 +127,7 @@ would be used to create all `v0.7` tags (e.g. `v0.7.0`, `v0.7.1`). $ ${EDITOR:-nano -w} README.md $ git commit -a -m "Update README to reference $MAJOR.$MINOR.$PATCH" ``` -5. Change root build files to remove "-SNAPSHOT" for the next release version +7. Change root build files to remove "-SNAPSHOT" for the next release version (e.g. `0.7.0`). Commit the result and make a tag: ```bash @@ -116,7 +137,7 @@ would be used to create all `v0.7` tags (e.g. `v0.7.0`, `v0.7.1`). $ git commit -a -m "Bump version to $MAJOR.$MINOR.$PATCH" $ git tag -a v$MAJOR.$MINOR.$PATCH -m "Version $MAJOR.$MINOR.$PATCH" ``` -6. Change root build files to the next snapshot version (e.g. `0.7.1-SNAPSHOT`). +8. Change root build files to the next snapshot version (e.g. `0.7.1-SNAPSHOT`). Commit the result: ```bash @@ -126,7 +147,7 @@ would be used to create all `v0.7` tags (e.g. `v0.7.0`, `v0.7.1`). $ ./gradlew build $ git commit -a -m "Bump version to $MAJOR.$MINOR.$((PATCH+1))-SNAPSHOT" ``` -7. Go through PR review and push the release tag and updated release branch to +9. Go through PR review and push the release tag and updated release branch to GitHub: ```bash @@ -135,27 +156,6 @@ would be used to create all `v0.7` tags (e.g. `v0.7.0`, `v0.7.1`). $ git push upstream v$MAJOR.$MINOR.$PATCH $ git push upstream v$MAJOR.$MINOR.x ``` -8. Make sure you are [logged in](https://grpc-testing.appspot.com/manage) to - Jenkins, then make a [new release - job](https://grpc-testing.appspot.com/view/Releases/newJob) - * _Name_: gRPC-Java-$MAJOR.$MINOR-Windows - * _Copy from_: gRPC-Java-master-windows - * Click _OK_ button - * _Display Name_ under _Use custom workspace_ (not ~~Project - url~~): gRPC Java $MAJOR.$MINOR Windows - * Under _Source Code Management_, _Branches to build_'s - _Branch Specifier_: `*/v$MAJOR.$MINOR.x` - * Under _Build Triggers_, _Build periodically_: `H H * * H` - * Click _SAVE_ button - * Click _Build Now_ - * Click on job #1, then _Console Output_. Verify the `git checkout` checked - out the correct commit -9. Go to [Travis CI settings](https://travis-ci.org/grpc/grpc-java/settings) and - add a _Cron Job_: - * Branch: `v$MAJOR.$MINOR.x` - * Interval: `weekly` - * Options: `Do not run if there has been a build in the last 24h` - * Click _Add_ button Setup Build Environment --------------------------- |