-
Notifications
You must be signed in to change notification settings - Fork 1.3k
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.2-rc-3 to trunk #18318
Merge 22.2-rc-3 to trunk #18318
Conversation
Pass domain_purchase parameter to list prices and not as free
…elease_1.93.1 Integrate gutenberg-mobile release 1.93.1
…-Fix-Navigation Fix dashboard card domain navigation
…-issue Fix camera permission issue
Found 1 violations: The PR caused the following dependency changes:-\--- org.wordpress:utils:{strictly 3.6.0} -> 3.6.0
+\--- org.wordpress:utils:{strictly 3.6.1} -> 3.6.1
Please review and act accordingly
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
👋 @oguzkocer !
FYI: There is a build error due to this me_btn_help
string found more than once within values-de
(CI). 🤷
Build Failure
| [2023-04-25T02:41:39Z] > Task :WordPress:mergeJetpackVanillaReleaseResources FAILED
| [2023-04-25T02:41:39Z] ERROR:/var/lib/buildkite-agent/builds/ci-android-i-0c594a6ea7f9e0619-1/automattic/wordpress-android/WordPress/src/main/res/values-de/strings.xml: Resource and asset merger: Found item String/me_btn_help more than one time
| [2023-04-25T02:41:39Z]
| [2023-04-25T02:41:39Z] > Task :libs:editor:lintAnalyzeRelease
| [2023-04-25T02:41:39Z] org.wordpress.android.lint.WordPressIssueRegistry in /var/lib/buildkite-agent/.gradle/caches/modules-2/files-2.1/org.wordpress/lint/1.1.0/d8905a4753b2053f888451b34448eb9ecc85e7de/lint-1.1.0.jar does not specify a vendor; see IssueRegistry#vendor
| [2023-04-25T02:41:39Z]
| [2023-04-25T02:42:01Z] FAILURE: Build failed with an exception.
| [2023-04-25T02:42:01Z]
| [2023-04-25T02:42:01Z] * What went wrong:
| [2023-04-25T02:42:01Z] Execution failed for task ':WordPress:mergeJetpackVanillaReleaseResources'.
| [2023-04-25T02:42:01Z] > /var/lib/buildkite-agent/builds/ci-android-i-0c594a6ea7f9e0619-1/automattic/wordpress-android/WordPress/src/main/res/values-de/strings.xml: Error: Found item String/me_btn_help more than one time
Otherwise, everything LGTM, included the merge conflict resolutions. As such, I'll approve this PR in order to unblock it from merging. Feel free to merge it as soon as the build failure gets resolved. 👍
Thanks @ParaskP7 🙇♂️ |
📲 You can test the changes from this Pull Request in Jetpack by scanning the QR code below to install the corresponding build.
|
📲 You can test the changes from this Pull Request in WordPress by scanning the QR code below to install the corresponding build.
|
The number of arguments for this string has been changed in #18315, so these translations are no longer accurate and causing lint failures.
The number of arguments for I've also left a suggestion in the original PR to update the string name along its value - especially when the number of arguments have changed. |
Contains the changes from #18296, #18301 & #18290.
There were 3 conflicts in 2 files:
I kept both strings as they both seem to be in use.
Per usual, I kept the alpha version over the hotfix one.
For
wordPressUtilsVersion
, I kept the later version andindexosMediaForMobileVersion
is just an addition.