Merge finalized release 21.8 (take 2) #20254
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…21.7.2-into-release-21.8 Got conflicts in the `config/Version.*.xcconfig` files. Resolved them, as usual for hotfixes going into release branches, via `git checkout --theirs` to keep the release branch version of the files.
…elease_1.89.1 Integrate gutenberg-mobile release 1.89.1
This is a workaround to prevent the crash happening in #20245. The crash happens when the app attempts to clean up Quick Start tours. The clean up is done when the app determines that Jetpack features are no longer to be shown. However, the clean up produces a Core Data crash which I haven't understood properly yet. So a workaround is to simply not do the clean up and leave the Quick Start tours in Core Data. They won't be visible to the user.
Got conflicts in `Podfile` and `Podfile.lock` because both branches updated Gutenberg. I addressed them with `git checkout --theirs` to keep the version from `trunk`, then run `bundle exec pod install` to ensure the lockfile was entirely up to date.
Generated by 🚫 dangerJS |
|
I'm going to admin merge this PR, on the basis that the diff is basically the same as the already approved #20243 and that I need to move on with the code freeze for 21.9. |
4 tasks
You can test the changes in Jetpack from this Pull Request by:
|
You can test the changes in WordPress from this Pull Request by:
|
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This takes over #20243, to track the crash fix that landed on 21.8 at the last minute, resulting in the finalized build being rejected and in a new one being created.
See also p8Qyks-53V-p2#comment-1967