From 554287a0cd934e12879c9b4a9ab5ebf6153157a9 Mon Sep 17 00:00:00 2001 From: Eric Anderson Date: Thu, 16 Jun 2016 10:12:41 -0700 Subject: [PATCH] docs: Add missing files to sed in RELEASING --- RELEASING.md | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/RELEASING.md b/RELEASING.md index 6a3f25f83b..3393f45239 100644 --- a/RELEASING.md +++ b/RELEASING.md @@ -69,8 +69,7 @@ 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 `build.gradle` and - `android-interop-testing/app/build.gradle` to the next minor snapshot (e.g. +2. For `master`, change root build files to the next minor snapshot (e.g. ``0.8.0-SNAPSHOT``). ```bash @@ -88,25 +87,26 @@ would be used to create all `v0.7` tags (e.g. `v0.7.0`, `v0.7.1`). $ git merge --ff-only bump-version $ git push upstream master ``` -4. For vMajor.Minor.x branch, change `build.gradle` and - `android-interop-testing/app/build.gradle` to remove "-SNAPSHOT" for the next - release version (e.g. `0.7.0`). Commit the result and make a tag: +4. For vMajor.Minor.x branch, 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 $ git checkout -b release v$MAJOR.$MINOR.x # Change version to remove -SNAPSHOT $ sed -i 's/-SNAPSHOT\(.*CURRENT_GRPC_VERSION\)/\1/' \ - build.gradle android-interop-testing/app/build.gradle + build.gradle android-interop-testing/app/build.gradle \ + examples/android/app/build.gradle $ git commit -a -m "Bump version to $MAJOR.$MINOR.$PATCH" $ git tag -a v$MAJOR.$MINOR.$PATCH -m "Version $MAJOR.$MINOR.$PATCH" ``` -5. Change `build.gradle` and `android-interop-testing/app/build.gradle` to the - next snapshot version (e.g. `0.7.1-SNAPSHOT`). Commit the result: +5. Change root build files to the next snapshot version (e.g. `0.7.1-SNAPSHOT`). + Commit the result: ```bash # Change version to next patch and add -SNAPSHOT $ sed -i 's/[0-9]\+\.[0-9]\+\.[0-9]\+\(.*CURRENT_GRPC_VERSION\)/'$MAJOR.$MINOR.$((PATCH+1))-SNAPSHOT'\1/' \ - build.gradle android-interop-testing/app/build.gradle + build.gradle android-interop-testing/app/build.gradle \ + examples/android/app/build.gradle $ git commit -a -m "Bump version to $MAJOR.$MINOR.$((PATCH+1))-SNAPSHOT" ``` 6. Go through PR review and push the release tag and updated release branch to