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

Jump to bottom

Merge release/19.8 (19.8.0.2 beta) #18584

Merged
merged 20 commits into from
May 13, 2022
Merged

Merge release/19.8 (19.8.0.2 beta) #18584

merged 20 commits into from
May 13, 2022

Conversation

AliSoftware
Copy link
Contributor

@AliSoftware AliSoftware commented May 12, 2022 •
edited
Loading

Note: I've also pointed the release-toolkit to trunk temporarily, in order to get the fix for the 429 Too Many Requests HTTP errors I otherwise got while pulling the translations from GlotPress.

Conflict Resolution

The usual Gutenberg version conflict on Podfile.lock, expected when we do a GBM betafix.

Resolved by keeping what was in trunk, then re-ran be pod install to re-align the Podfile.lock.
PS: Note that the fixes that landed in GBM 1.75.1 are already included in the 1.76.0 which should land in trunk before next code freeze 👌

cc @geriux @mchowning

hassaanelgarem and others added 17 commits May 9, 2022 04:53
@hassaanelgarem
Fix: crash on non-iOS 15 when loading posts card
a7ba1ee
@leandroalonso @hassaanelgarem
refactor: typo
ca4ac4b
@hassaanelgarem
Fix: reset dashboard states on logout
53e8efe
@hassaanelgarem
Refactor: remove unneeded if available check
69a5d91
@hassaanelgarem
Fix: crash on iOS 14
1bceaa2
@hassaanelgarem
Merge pull request #18537 from wordpress-mobile/issue/fix-crash-ios-1…
f1d3925 
…4-posts-card-alt

My Site Dashboard: Fix crash on non-iOS 15 when loading posts cards
@hassaanelgarem
Merge pull request #18539 from wordpress-mobile/issue/18538-posts-car…
46b82a4 
…ds-not-loaded-after-logout

My Site Dashboard: Fix posts cards not loaded after logout
Release script: Update gutenberg-mobile ref
1019487
Analytics - Add editor block moved event
81e9940
Update Gutenberg ref
b22f684
Update Gutenberg ref
2eb586c
@mchowning
Merge pull request #18553 from wordpress-mobile/gutenberg/integrate_r…
d2c78ff 
…elease_1.75.1

Integrate gutenberg-mobile release 1.75.1
@AliSoftware
Point release-toolkit to trunk for now
5107680 
In order to get the patch for GlotPress 429 error code
@AliSoftware
Update app translations – Localizable.strings
6abfca4
@AliSoftware
Update WordPress metadata translations
8884427
@AliSoftware
Update Jetpack metadata translations
ada66ff
@AliSoftware
Bump version number
7bee798
@AliSoftware AliSoftware added this to the 19.8 ❄️ milestone May 12, 2022
@AliSoftware AliSoftware self-assigned this May 12, 2022
AliSoftware
AliSoftware commented May 12, 2022
View reviewed changes
Gemfile.lock
GIT
remote: git@github.com:wordpress-mobile/release-toolkit
revision: 329effd14e4176817d28ff5b97f35ea84a19c69e
branch: trunk
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pointing the release-toolkit to trunk in order to get this fix for the 429 Too Many Requests issue we had on GlotPress translations export.

@AliSoftware AliSoftware marked this pull request as ready for review May 12, 2022 10:05
@AliSoftware AliSoftware requested a review from a team May 12, 2022 10:05
@AliSoftware AliSoftware enabled auto-merge May 12, 2022 10:13
@wpmobilebot
Copy link
Contributor

wpmobilebot commented May 12, 2022 •
edited
Loading

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 pr18584-296cf99 on your iPhone

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

@wpmobilebot
Copy link
Contributor

wpmobilebot commented May 12, 2022 •
edited
Loading

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 pr18584-296cf99 on your iPhone

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

@AliSoftware
Merge branch 'trunk' into merge/19.8.0.2
296cf99 
# Conflicts:
#	Podfile
#	Podfile.lock
@AliSoftware
Copy link
Contributor Author

Update: since Gutenberg 1.76.0 just landed in trunk, that led to (expected) new conflicts in the PR

<<<<<<< merge/19.8.0.2
    gutenberg :tag => 'v1.75.1'
=======
    gutenberg :tag => 'v1.76.0'
>>>>>>> trunk

which I re-resolved by keeping the 1.76.0 from trunk and re-syncing the Podfile.lock file again.

@ParaskP7 ParaskP7 self-assigned this May 13, 2022
ParaskP7
ParaskP7 approved these changes May 13, 2022
View reviewed changes
Copy link

@ParaskP7 ParaskP7 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM! 💯

@AliSoftware AliSoftware merged commit 90f4906 into trunk May 13, 2022
@AliSoftware AliSoftware deleted the merge/19.8.0.2 branch May 13, 2022 15:44
@AliSoftware AliSoftware mentioned this pull request May 13, 2022
Merged
4 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ParaskP7 ParaskP7 ParaskP7 approved these changes

Assignees

@AliSoftware AliSoftware

@ParaskP7 ParaskP7

Labels
Releases
Projects
None yet
Milestone
19.8
Development

Successfully merging this pull request may close these issues.
6 participants
@AliSoftware @wpmobilebot @ParaskP7 @hassaanelgarem @leandroalonso @mchowning