Skip to content

Conversation

@wpmobilebot
Copy link
Collaborator

Merging release/22.6 into trunk.

Via intermediate branch merge/release-22.6-into-trunk, to help fix conflicts if any:

                            release/22.6  ----o-- - - -
                                               \
           merge/release-22.6-into-trunk        `---.
                                                     \
                                   trunk  ------------x- - -

@wpmobilebot wpmobilebot added the Releases Used in release management. Using this label will skip some bot checks. label Jun 27, 2025
@wpmobilebot wpmobilebot added this to the 22.7 milestone Jun 27, 2025
@toupper
Copy link
Contributor

toupper commented Jun 27, 2025

@itsmeichigo @RafaelKayumov Could you please solve the conflicts there, and approve when done? Thanks a lot!

@RafaelKayumov
Copy link
Contributor

Just for reference. Networking tests were moved to Swift packages here. This seems to cause the conflict.

@RafaelKayumov
Copy link
Contributor

The rest of networking is moved to the SPM: Simplify Networking into a Swift package - Sources only

@dangermattic
Copy link
Collaborator

1 Message
📖 This PR has the Releases label: some checks will be skipped.

Generated by 🚫 Danger

@RafaelKayumov
Copy link
Contributor

Made a local trunk merge-in. Made sure all changes made to conflicting files in beta were in place after the merge-in.

@wpmobilebot
Copy link
Collaborator Author

App Icon📲 You can test the changes from this Pull Request in WooCommerce iOS Prototype by scanning the QR code below to install the corresponding build.

App NameWooCommerce iOS Prototype
Build Number30836
VersionPR #15827
Bundle IDcom.automattic.alpha.woocommerce
Commit1578495
Installation URL609gvtm5v26l0
Automatticians: You can use our internal self-serve MC tool to give yourself access to those builds if needed.

@toupper toupper merged commit f006b2f into trunk Jun 27, 2025
13 checks passed
@toupper toupper deleted the merge/release-22.6-into-trunk branch June 27, 2025 12:28
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Releases Used in release management. Using this label will skip some bot checks.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants