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/23.9.0.4 into trunk #22319

Merged
merged 44 commits into from
Jan 3, 2024
Merged

Merge/23.9.0.4 into trunk #22319

merged 44 commits into from
Jan 3, 2024

Conversation

spencertransier
Copy link
Contributor

This PR merges the changes from the 23.9.0.4 beta build into trunk. Includes:

Siobhan and others added 30 commits December 14, 2023 14:09
@spencertransier spencertransier requested a review from a team January 2, 2024 21:56
@spencertransier spencertransier added this to the 24.0 milestone Jan 2, 2024
@spencertransier spencertransier removed the request for review from a team January 2, 2024 22:03
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.

Thanks @spencertransier for getting ahead on this while I was offline!

Love the power of distributed teams ❤️ 👏 and of teammates that are always happy to help!!!

@mokagio
Copy link
Contributor

mokagio commented Jan 3, 2024

CI failed with:

[!] CocoaPods could not find compatible versions for pod "Gutenberg":
  | In snapshot (Podfile.lock):
  | Gutenberg (from `https://cdn.a8c-ci.services/gutenberg-mobile/Gutenberg-v1.110.0-alpha2.podspec`)
  |  
  | In Podfile:
  | Gutenberg (from `https://cdn.a8c-ci.services/gutenberg-mobile/Gutenberg-v1.110.0-alpha2.podspec`)
  |  
  | It seems like you've changed the version of the dependency `Gutenberg` and it differs from the version stored in `Pods/Local Podspecs`.
  | You should run `pod update Gutenberg --no-repo-update` to apply changes made locally.
 ```

Looking into it 👀 

Notice that the version apparently downgraded from 1.109.3 to 1.109.2.

The reason this happened is that we are on a merge branch from the
release branch into trunk.

The release branch commit from which this branch originated is
22b2216.
The latest commit on trunk that was merged into here is
12065e6.

At those commits, release/23.9 uses Gutenberg for Mobile Apps (GMA) v1.109.3 while trunk
v1.110.0-alpha2.

The versioning in GMA works in a way that only updates the version
value when a new stable version is shipped.
As such, v1.110.0-alpha2 results has having version 1.109.2 as can be
seen in the source code at
https://github.com/wordpress-mobile/gutenberg-mobile/blob/v1.110.0-alpha2/package.json#L3

Since the version of trunk that was merged in this branch uses
v1.110.0-alpha2, the computed version number tracked in `Podfile.lock`
is 1.109.2.
@peril-wordpress-mobile
Copy link

Messages
📖 This PR has the 'Releases' label: some checks will be skipped.

Generated by 🚫 dangerJS

@wpmobilebot
Copy link
Contributor

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 Numberpr22319-99149c8
Version23.9
Bundle IDorg.wordpress.alpha
Commit99149c8
App Center BuildWPiOS - One-Offs #8292
Automatticians: You can use our internal self-serve MC tool to give yourself access to App Center if needed.

@wpmobilebot
Copy link
Contributor

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 Numberpr22319-99149c8
Version23.9
Bundle IDcom.jetpack.alpha
Commit99149c8
App Center Buildjetpack-installable-builds #7315
Automatticians: You can use our internal self-serve MC tool to give yourself access to App Center if needed.

@mokagio mokagio disabled auto-merge January 3, 2024 04:49
@mokagio
Copy link
Contributor

mokagio commented Jan 3, 2024

😞 there's been a UI test failure on iPhone.

Investigating through the xcresult to decide whether it needs work here or we can file it as a non-blocker.

@mokagio
Copy link
Contributor

mokagio commented Jan 3, 2024

Investigating through the xcresult to decide whether it needs work here or we can file it as a non-blocker.

Okay. Here's what I think happened and why I feel comfortable merging the PR despite of the failure.

First of all, the failure was at the time of pressing the "View" button on the "toast" shown after publishing a post.

The timeline in the xcresult shows that the "toast" appears on screen (an important ✅) but the test driver fails to tap the button. I couldn't understand from the logs why. The only guess I have is that it tried while the animation was ongoing and the button wasn't interactive yet.

image

The test didn't fail at that point, though. It tried to hit the button two more times.

On the second retry, it waited for the app to become idle for 9 seconds:

image

By that time the idle requirement was met, the toast had disappeared and any further attempt to find the button failed:

image

While it's possible this is an issue introduced by code changes here, it's also clear that the feature is not 5 broken for the users. I also verified that on the TestFlight build.

RPReplay_Final1704258378.mov

As such, we can merge this and move on with the important localization business.

One question is why did the tests wait 9 seconds for the app to idle?! Could that be related to the recap toast fade out?

@mokagio mokagio merged commit 4e9bb83 into trunk Jan 3, 2024
20 of 23 checks passed
@mokagio mokagio deleted the merge/23.9.0.4-into-trunk branch January 3, 2024 05:11
@mokagio mokagio modified the milestones: 24.0, 23.9 ❄️ Jan 5, 2024
@mokagio mokagio mentioned this pull request Jan 5, 2024
3 tasks
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.

10 participants