diff --git a/.github/PULL_REQUEST_TEMPLATE/release_pull_request.md b/.github/PULL_REQUEST_TEMPLATE/release_pull_request.md index 0d80fd3363..60d74fff90 100644 --- a/.github/PULL_REQUEST_TEMPLATE/release_pull_request.md +++ b/.github/PULL_REQUEST_TEMPLATE/release_pull_request.md @@ -11,11 +11,10 @@ Release for Gutenberg Mobile v1.XX.Y ## Extra PRs that Landed After the Release Was Cut -- [ ] PR 1 -- [ ] PR 2 +No extra PRs yet. 🎉 ## Changes - + - Change 1 - Change 2 @@ -34,6 +33,6 @@ Release for Gutenberg Mobile v1.XX.Y - iOS: Aztec dependencies match in `RNTAztecView.podspec` and `gutenberg/packages/react-native-aztec/RNTAztecView.podspec`. - Android: 'grep aztecVersion react-native-aztec/android/build.gradle'. - [ ] Gutenberg 'Podfile' and 'Podfile.lock' inside 'gutenberg/package/react-native-editor/ios/' are updated to the release number. +- [ ] Check if `RELEASE-NOTES.txt` and `gutenberg/packages/react-native-editor/CHANGELOG.md` are updated with all the changes that made it to the release. - [ ] Bundle package of the release is updated. -- [ ] Check if `RELEASE-NOTES.txt` and `gutenberg/packages/react-native-editor/RELEASE-NOTES.txt` are updated with all the changes that made it to the release. diff --git a/docs/Releasing.md b/docs/Releasing.md index 3439ecc945..090993c917 100644 --- a/docs/Releasing.md +++ b/docs/Releasing.md @@ -36,30 +36,6 @@ cut a new release.

o Visit all opened PR's in gutenberg-mobile repo that are assigned to milestone X.XX.X and leave proper message with options to merge them or to bump them to the next version.

- -

o In the gutenberg-mobile submodule, branch develop to the release branch (eg. git checkout develop; git pull origin develop; git checkout -b release/X.XX.X).

- - - -

o Update the package.json file with the new version number in package.json and gutenberg/packages/react-native-editor/package.json

- - - -

o Update the bundle files by running npm run bundle

- - - -

o Push the release branch, git push origin release/X.XX.X.

- - - -

o Create the gutenberg submodule branch: cd gutenberg; git checkout -b rnmobile/release-X.XX.X.

- - - -

o Push the gutenberg submodule branch: git push origin rnmobile/release-X.XX.X.

- -

o Make sure we use a released version of Aztec iOS and Aztec Android: grep WordPress-Aztec-iOS RNTAztecView.podspec and grep aztecVersion gutenberg/packages/react-native-aztec/android/build.gradle(should be part of a ./release-check.sh script). Also insure that the line for testing non-official versions of Aztec on iOS is commented out (this command should find a match: grep "^s*#pod 'WordPress-Aztec-iOS'" ios/Podfile)

@@ -75,11 +51,11 @@ cut a new release. -

o Open a PR based on the release branch in Gutenberg-Mobile and target main. Example PR: https://github.com/wordpress-mobile/gutenberg-mobile/pull/1627. There should not be any conflicts with this PR.

+

o From gutenberg-mobile's develop branch (making sure the gutenberg submodule is updated and clean), run the release script: ./bin/release_automation.sh. This will take care of creating the branches in gutenberg-mobile and gutenberg as well as creating the gutenberg-mobile release PR.

-

o Create a new branch in the main WP apps (WordPress-iOS, WordPress-Android) named gutenberg/integrate_release_X.XX.X.

+

o Create a new branch in the main WP apps (WordPress-iOS, WordPress-Android) based on their develop branches. Name the new branch gutenberg/integrate_release_X.XX.X.

@@ -87,7 +63,7 @@ cut a new release. -

o Create a PR in WPAndroid and WPiOS. Example on WPAndroid, WPiOS. To write the PR description: pull the differences between previous and current releases. Update the RELEASE-NOTES.txt files in each PR (get info from the gutenberg-mobile RELEASE-NOTES.txt).

+

o Create a PR in WPAndroid and WPiOS with a description along these lines: "This PR incorporates the X.XX.X release of gutenberg-mobile. For details about the changes included in this PR and testing instructions please see the related gutenberg-mobile PR: [gb-mobile PR link]."

@@ -95,7 +71,7 @@ cut a new release. -

o On Android update the git submodule reference for libs/gutenberg-mobile (cd libs/gutenberg-mobile && git checkout release/X.XX.X && git pull origin release/X.XX.X && cd .. && git add gutenberg-mobile) and run python tools/merge_strings_xml.py to update the main strings.xml file.

+

o On Android: (1) update the git submodule reference for libs/gutenberg-mobile (cd libs/gutenberg-mobile && git checkout release/X.XX.X && git pull origin release/X.XX.X && cd .. && git add gutenberg-mobile); and (2) run python tools/merge_strings_xml.py to update the main strings.xml file.