Skip to content

Merge finalized 21.5 release into trunk #19960

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

Jump to bottom
Merged
merged 12 commits into from
Jan 20, 2023
Merged

Merge finalized 21.5 release into trunk #19960

merged 12 commits into from
Jan 20, 2023

Conversation

@mokagio
Copy link
Contributor

@mokagio mokagio commented Jan 20, 2023

There were conflicts in Podfile.lock due to Pods changing on both branches. Fixed them by re-running bundle exec pod install to generate an up-to-date checksum.

This last build includes:

Release checks

  • Fastlane localized release_notes.txt updates
  • Localized .strings updates
  • Build number bump in version .xcconfig file
  • Plus diffs from the PRs that landed on the release branch since the last beta

hassaanelgarem and others added 12 commits January 18, 2023 00:16
@hassaanelgarem
Update: Trigger site creation flow after JP overlay is dismissed
9fea8be 
not before
@dcalhoun
Release script: Update gutenberg-mobile ref
2ecf98e
@dcalhoun
build: Update Gutenberg ref
37143a1
@hassaanelgarem
Merge pull request #19938 from wordpress-mobile/fix/site-creation-flo…
1d6a453 
…w-after-overlay

Jetpack Focus: Fix site creation flow not being triggered after JP overlay is dismissed
@fluiddot
Update Gutenberg Mobile ref
855e83e
@dcalhoun
build: Update Gutenberg ref
2c7869d
@dcalhoun
Merge pull request #19945 from wordpress-mobile/gutenberg/integrate_r…
6f766ac 
…elease_1.87.2

Integrate gutenberg-mobile release 1.87.2
@mokagio
Update app translations – Localizable.strings
9ce5b9d
@mokagio
Update WordPress metadata translations
a2e2bb5
@mokagio
Update Jetpack metadata translations
ab7f453
@mokagio
Bump version number
bcc71bf
@mokagio
Merge 'origin/trunk' into merge/release-21.5-into-trunk
3162d58 
There were conflicts in `Podfile.lock` due to Pods changing on both
branches.

Fixed them by re-running `bundle exec pod install` to generate an
up-to-date checksum.
@mokagio mokagio requested a review from a team January 20, 2023 11:22
@mokagio mokagio added this to the 21.6 milestone Jan 20, 2023
@mokagio mokagio enabled auto-merge January 20, 2023 11:23
@wpmobilebot
Copy link
Contributor

wpmobilebot commented Jan 20, 2023

You can test the changes in WordPress from this Pull Request by:
  • Clicking here or scanning the QR code below to access App Center
  • Then installing the build number pr19960-3162d58 on your iPhone

If you need access to App Center, please ask a maintainer to add you.

@wpmobilebot
Copy link
Contributor

wpmobilebot commented Jan 20, 2023

You can test the changes in Jetpack from this Pull Request by:
  • Clicking here or scanning the QR code below to access App Center
  • Then installing the build number pr19960-3162d58 on your iPhone

If you need access to App Center, please ask a maintainer to add you.

@mokagio mokagio merged commit 4c003c1 into trunk Jan 20, 2023
@mokagio mokagio deleted the merge/release-21.5-into-trunk branch January 20, 2023 17:42
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@AliSoftware AliSoftware AliSoftware approved these changes

Assignees

No one assigned

Labels

Releases

Projects

None yet

Milestone

21.6

Development

Successfully merging this pull request may close these issues.

7 participants

@mokagio @wpmobilebot @AliSoftware @hassaanelgarem @dcalhoun @fluiddot