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.

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

Merge 24.2 code freeze to trunk #20128

Merged
merged 32 commits into from
Feb 6, 2024
Merged

Merge 24.2 code freeze to trunk #20128

merged 32 commits into from
Feb 6, 2024

Conversation

wpmobilebot
Copy link
Contributor

No description provided.

@wpmobilebot wpmobilebot added the Releases Label related to managing releases label Feb 5, 2024
@peril-wordpress-mobile
Copy link

peril-wordpress-mobile bot commented Feb 5, 2024

Warnings
⚠️ The PlayStoreStrings.po file must be updated any time changes are made to release notes

Generated by 🚫 dangerJS

@wpmobilebot
Copy link
Contributor Author

wpmobilebot commented Feb 5, 2024

WordPress📲 You can test the changes from this Pull Request in WordPress by scanning the QR code below to install the corresponding build.
App NameWordPress WordPress
FlavorJalapeno
Build TypeDebug
Versionpr20128-69b9894
Commit69b9894
Direct Downloadwordpress-prototype-build-pr20128-69b9894.apk
Note: Google Login is not supported on these builds.

@wpmobilebot
Copy link
Contributor Author

wpmobilebot commented Feb 5, 2024

Jetpack📲 You can test the changes from this Pull Request in Jetpack by scanning the QR code below to install the corresponding build.
App NameJetpack Jetpack
FlavorJalapeno
Build TypeDebug
Versionpr20128-69b9894
Commit69b9894
Direct Downloadjetpack-prototype-build-pr20128-69b9894.apk
Note: Google Login is not supported on these builds.

RenanLukas and others added 2 commits February 6, 2024 14:41
…ng-tag-update-filter-pill

[Reader IA] Subscribing to tag doesn't update the chip count
…-quick-start

[Reader IA] Simplify Reader Quick Start flow for new UX
Copy link

codecov bot commented Feb 6, 2024

Codecov Report

Attention: 3 lines in your changes are missing coverage. Please review.

Comparison is base (dd1d1e9) 54.59% compared to head (69b9894) 40.22%.

Files Patch % Lines
...ress/android/ui/reader/ReaderActivityLauncher.java 0.00% 3 Missing ⚠️
Additional details and impacted files
@@             Coverage Diff             @@
##            trunk   #20128       +/-   ##
===========================================
- Coverage   54.59%   40.22%   -14.38%     
===========================================
  Files          14     1469     +1455     
  Lines         522    67556    +67034     
  Branches       52    11183    +11131     
===========================================
+ Hits          285    27173    +26888     
- Misses        219    37894    +37675     
- Partials       18     2489     +2471     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

Copy link
Contributor

@mokagio mokagio left a comment

Choose a reason for hiding this comment

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

  • versionName rc number and versionCode bumps in version.properties
  • string.xml updates

Notice that unfortunately (or luckily, depending on how one looks at it) this code freeze sat idle in the PR queue for a day or so, resulting in new PRs landing in the release branch since opening it. This made the commits list a bit confusing (what's with the commit on the branch before the version bump?! ah! they are the commits from the feature branches that went from pointing to trunk to pointing to the release branch)

This turned out to be an advantage, though, because there have been some strings changes, see also p1707227033739459-slack-CC7L49W13. I haven't checked the Fastfile, but I'm pretty sure Android works like iOS and we'll need to run a command locally to update strings.xml. So, really, this will save us having to send two new strings notifications to the translators with the GlotPress automation 😄

@spencertransier I'm going to request changes to make sure the PR is merged only with the correct up-to-date strings.xml. Feel free to dismiss if I've missed something.

@mokagio
Copy link
Contributor

mokagio commented Feb 6, 2024

Sorry, I would find and run the automation myself, but I just run out of time and gotta do school drop off 🏃‍♂️

@spencertransier
Copy link
Contributor

@mokagio I updated the frozen strings.xml files with the new string changes, so this is ready to merge. I can't actually create a new beta with the recent PRs because the automation checks out trunk first but can't find the 24.2 version because this PR hasn't been merged yet (I plan to put up a PR to remove the trunk checkout like we've done in the other apps). After this is merged, I'll create a new beta.

@mokagio mokagio enabled auto-merge February 6, 2024 23:30
@mokagio mokagio merged commit e50edd4 into trunk Feb 6, 2024
22 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Releases Label related to managing releases
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants