Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update release checklist with usage of release_automation.sh script #2512

Merged
merged 1 commit into from
Jul 28, 2020
Merged

Update release checklist with usage of release_automation.sh script #2512

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 3 additions & 4 deletions .github/PULL_REQUEST_TEMPLATE/release_pull_request.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
<!-- To determine the changes you can check the RELEASE-NOTES.txt file and cross check with the list of commits that are part of the PR -->
<!-- To determine the changes you can check the RELEASE-NOTES.txt and gutenberg/packages/react-native-editor/CHANGELOG.md files and cross check with the list of commits that are part of the PR -->

- Change 1
- Change 2
Expand All @@ -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.

32 changes: 4 additions & 28 deletions docs/Releasing.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,30 +36,6 @@ cut a new release.
<p>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.</p>
<!-- /wp:paragraph -->

<!-- wp:paragraph -->
<p>o In the <code>gutenberg-mobile</code> submodule, branch <code>develop</code> to the release branch (eg. <code>git checkout develop; git pull origin develop; git checkout -b release/X.XX.X</code>).</p>
<!-- /wp:paragraph -->

<!-- wp:paragraph -->
<p>o Update the package.json file with the new version number in <code>package.json</code> and <code>gutenberg/packages/react-native-editor/package.json</code></p>
<!-- /wp:paragraph -->

<!-- wp:paragraph -->
<p>o Update the bundle files by running <code>npm run bundle</code></p>
<!-- /wp:paragraph -->

<!-- wp:paragraph -->
<p>o Push the release branch, <code>git push origin release/X.XX.X</code>.</p>
<!-- /wp:paragraph -->

<!-- wp:paragraph -->
<p>o Create the gutenberg submodule branch: <code>cd gutenberg; git checkout -b rnmobile/release-X.XX.X</code>.</p>
<!-- /wp:paragraph -->

<!-- wp:paragraph -->
<p>o Push the gutenberg submodule branch: <code>git push origin rnmobile/release-X.XX.X</code>.</p>
<!-- /wp:paragraph -->

<!-- wp:paragraph -->
<p>o Make sure we use a released version of Aztec iOS and Aztec Android: <code>grep WordPress-Aztec-iOS RNTAztecView.podspec</code> and <code>grep aztecVersion gutenberg/packages/react-native-aztec/android/build.gradle</code>(should be part of a <code>./release-check.sh</code> script). Also insure that the line for testing non-official versions of Aztec on iOS is commented out (this command should find a match: <code>grep "^s*#pod 'WordPress-Aztec-iOS'" ios/Podfile</code>)</p>
<!-- /wp:paragraph -->
Expand All @@ -75,27 +51,27 @@ cut a new release.
<!-- /wp:paragraph -->

<!-- wp:paragraph -->
<p>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.</p>
<p>o From gutenberg-mobile's <code>develop</code> branch (making sure the gutenberg submodule is updated and clean), run the release script: <code>./bin/release_automation.sh</code>. This will take care of creating the branches in gutenberg-mobile and gutenberg as well as creating the gutenberg-mobile release PR.</p>
<!-- /wp:paragraph -->

<!-- wp:paragraph -->
<p>o Create a new branch in the main WP apps (WordPress-iOS, WordPress-Android) named <code>gutenberg/integrate_release_X.XX.X</code>.</p>
<p>o Create a new branch in the main WP apps (WordPress-iOS, WordPress-Android) based on their <code>develop</code> branches. Name the new branch <code>gutenberg/integrate_release_X.XX.X</code>.</p>
<!-- /wp:paragraph -->

<!-- wp:paragraph -->
<p>o Use the commit hash of the head of the release branch in Gutenberg-Mobile as the reference for the main apps.</p>
<!-- /wp:paragraph -->

<!-- wp:paragraph -->
<p>o Create a PR in WPAndroid and WPiOS. Example on <a href="https://github.com/wordpress-mobile/WordPress-Android/pull/10863">WPAndroid</a>, <a href="https://github.com/wordpress-mobile/WordPress-iOS/pull/13010">WPiOS</a>. 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).</p>
<p>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]."</p>
<!-- /wp:paragraph -->

<!-- wp:paragraph -->
<p>o In iOS update the file <code>Podfile</code> to point to the new hash in GB-Mobile and if needed also update the reference to Aztec to the new release. Then run <code>rake dependencies</code>, commit and push.</p>
<!-- /wp:paragraph -->

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

<!-- wp:paragraph -->
Expand Down