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 22.1 code freeze #20462

Merged
merged 8 commits into from
Apr 3, 2023
Merged

Merge 22.1 code freeze #20462

merged 8 commits into from
Apr 3, 2023

Conversation

mokagio
Copy link
Contributor

@mokagio mokagio commented Apr 3, 2023

  • Update internal Pods to stable version
  • New version header in RELEASE-NOTE.txt
  • Localizable.strings updated
  • release_notes.txt updated with notes from RELEASE-NOTE.txt for current version
  • Version update in .xcconfig

mokagio added 8 commits April 3, 2023 11:07
Notice that we also have a new major version of WordPressAuthenticator,
6.0.0, ready but that the upgrade to that one will happen in a dedicated
PR.
Notice that the entry that was removed did not have the "Jetpack-only"
label but was still a Jetpack-only feature. I verified this by following
the instructions in
#20369
and not seeing the button to personalize the home screen. This is
consistent with only Jetpack offering a home screen that is enhanced
with cards.
@mokagio mokagio self-assigned this Apr 3, 2023
WordPressKit: a161c49306369cfa22c648866cee5aba16d7cbac
WordPressShared: 8e59bc8cec256f54a7c4cc6c94911adc2a9a65d2
WordPressShared: 0aa459e5257a77184db87805a998f447443c9706
WordPressUI: c5be816f6c7b3392224ac21de9e521e89fa108ac
WPMediaPicker: 0d45dfd7b3c5651c5236ffd48c1b0b2f60a2d5d2
wpxmlrpc: 68db063041e85d186db21f674adf08d9c70627fd
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Notice no Podfile change because I run bundle exec pod update.

That's a questionable approach. It resulted in WordPressKit not updating to the latest version, 7.1.0, because the Podfile specifies it as ~> 7.0.0-beta.

It's not an issue in the context of this code freeze because the changes in 7.1.0 are used in a PR that hasn't been merged into trunk yet. But it did make me question whether I should revert to manually checking the various libraries instead of relying only on the Podfile specification.

Copy link
Contributor

Choose a reason for hiding this comment

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

It's pretty strange to see CocoaPods picking up the podspec in custom spec repo or trunk randomly, which feels like a bug to me.

Copy link
Contributor

Choose a reason for hiding this comment

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

Sorry, I meant to post this comment for this line above.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

It's pretty strange to see CocoaPods picking up the podspec in custom spec repo or trunk randomly, which feels like a bug to me.

What I think happened is that last time I/someone run pod update for WordPressShared the pod was only available in our specs repo. For reference, as I'm not sure if it's documented anywhere, we have that custom repo to bypass CocoaPods sometimes taking a while to make new pods available.

Copy link
Contributor

Choose a reason for hiding this comment

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

What I think happened is that last time I/someone run pod update for WordPressShared the pod was only available in our specs repo.

Yeah, this is indeed the most likely scenario that would explain that.

For reference, as I'm not sure if it's documented anywhere, we have that custom repo to bypass CocoaPods sometimes taking a while to make new pods available.

See paaHJt-1SO-p2 for more details

@@ -8360,6 +8438,9 @@ Please install the %3$@ to use the app with this site.";
/* Menu item label for linking a testimonial post. */
"Testimonials" = "Testimonials";

/* No comment provided by engineer. */
"Text color" = "Text color";
Copy link
Contributor Author

Choose a reason for hiding this comment

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

I can't locate the source of this string 🤔

@@ -7169,6 +7235,9 @@ Please install the %3$@ to use the app with this site.";
/* title of the button that searches the first domain. */
"Search for a domain" = "Search for a domain";

/* Select domain name. Subtitle */
"Search for a short and memorable keyword to help people find and visit your website." = "Search for a short and memorable keyword to help people find and visit your website.";
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Comment on lines -1 to +3
We don’t know about you, but we’re feeling 22. In honor of the occasion (and because you’ve been asking for it), you can now transform most types of blocks into other block types, like quotes, columns, and groups. Nice.

You’ll also see a few small visual changes to the My Site dashboard and the in-app survey.
* [**] [internal] Refactor updating account related Core Data operations, which ususally happens during log in and out of the app. [#20394]
* [***] [internal] Refactor uploading photos (from the device photo, the Free Photo library, and other sources) to the WordPress Media Library. Affected areas are where you can choose a photo and upload, including the "Media" screen, adding images to a post, updating site icon, etc. [#20322]
* [**] Warns user about sites with only individual plugins not supporting core app features and offers the option to switch to the Jetpack app. [#20408]
Copy link
Contributor Author

Choose a reason for hiding this comment

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

The raw notes include an entry that is not marked as "Jetpack-only" but that applies only to Jetpack:

* [**] Add a "Personalize Home Tab" button to the bottom of the Home tab that allows changing cards visibility. [#20369]

I decided to leave it out.

Copy link
Contributor

Choose a reason for hiding this comment

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

Good call @mokagio! I reviewed this PR but didn't realize it was missing the Jetpack-only prefix. Thanks for correcting it.

@mokagio mokagio changed the title ## Merge 22.1 code freeze Merge 22.1 code freeze Apr 3, 2023
@peril-wordpress-mobile
Copy link

Warnings
⚠️ The AppStoreStrings.po file must be updated any time changes are made to release notes
Messages
📖 This PR has the 'Releases' label: some checks will be skipped.

Generated by 🚫 dangerJS

@mokagio mokagio requested a review from a team April 3, 2023 02:19
@mokagio mokagio added this to the 22.1 ❄️ milestone Apr 3, 2023
@mokagio mokagio marked this pull request as ready for review April 3, 2023 02:19
@mokagio mokagio enabled auto-merge April 3, 2023 02:19
@wpmobilebot
Copy link
Contributor

wpmobilebot commented Apr 3, 2023

Jetpack Alpha📲 You can test the changes from this Pull Request in Jetpack Alpha by scanning the QR code below to install the corresponding build.
App NameJetpack Alpha Jetpack Alpha
ConfigurationRelease-Alpha
Build Numberpr20462-fd89f46
Version22.1
Bundle IDcom.jetpack.alpha
Commitfd89f46
App Center Buildjetpack-installable-builds #4417
Automatticians: You can use our internal self-serve MC tool to give yourself access to App Center if needed.

@wpmobilebot
Copy link
Contributor

wpmobilebot commented Apr 3, 2023

WordPress Alpha📲 You can test the changes from this Pull Request in WordPress Alpha by scanning the QR code below to install the corresponding build.
App NameWordPress Alpha WordPress Alpha
ConfigurationRelease-Alpha
Build Numberpr20462-fd89f46
Version22.1
Bundle IDorg.wordpress.alpha
Commitfd89f46
App Center BuildWPiOS - One-Offs #5389
Automatticians: You can use our internal self-serve MC tool to give yourself access to App Center if needed.

WordPressKit: a161c49306369cfa22c648866cee5aba16d7cbac
WordPressShared: 8e59bc8cec256f54a7c4cc6c94911adc2a9a65d2
WordPressShared: 0aa459e5257a77184db87805a998f447443c9706
WordPressUI: c5be816f6c7b3392224ac21de9e521e89fa108ac
WPMediaPicker: 0d45dfd7b3c5651c5236ffd48c1b0b2f60a2d5d2
wpxmlrpc: 68db063041e85d186db21f674adf08d9c70627fd
Copy link
Contributor

Choose a reason for hiding this comment

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

It's pretty strange to see CocoaPods picking up the podspec in custom spec repo or trunk randomly, which feels like a bug to me.

@mokagio mokagio merged commit 3cd51cf into trunk Apr 3, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants