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.2-rc-3 to trunk #18318

Merged
merged 15 commits into from
Apr 25, 2023
Merged

Merge 22.2-rc-3 to trunk #18318

merged 15 commits into from
Apr 25, 2023

Conversation

oguzkocer
Copy link
Contributor

Contains the changes from #18296, #18301 & #18290.

There were 3 conflicts in 2 files:

both modified:   WordPress/src/main/res/values-de/strings.xml
both modified:   build.gradle

<<<<<<< HEAD
    <string name="site_creation_domain_cost">%s/Jahr</string>
=======
    <string name="me_btn_help">Hilfe</string>
>>>>>>> origin/trunk

I kept both strings as they both seem to be in use.


<<<<<<< HEAD
    gutenbergMobileVersion = 'v1.93.1'
=======
    gutenbergMobileVersion = 'v1.94.0-alpha1'
>>>>>>> origin/trunk

Per usual, I kept the alpha version over the hotfix one.


<<<<<<< HEAD
    wordPressUtilsVersion = '3.6.1'
=======
    wordPressUtilsVersion = '3.6.0'
    indexosMediaForMobileVersion = '43a9026f0973a2f0a74fa813132f6a16f7499c3a'
>>>>>>> origin/trunk

For wordPressUtilsVersion, I kept the later version and indexosMediaForMobileVersion is just an addition.

@oguzkocer oguzkocer added the Releases Label related to managing releases label Apr 25, 2023
@oguzkocer oguzkocer added this to the 22.3 milestone Apr 25, 2023
@oguzkocer oguzkocer requested a review from a team April 25, 2023 02:36
@oguzkocer oguzkocer enabled auto-merge April 25, 2023 02:36
@wpmobilebot
Copy link
Contributor

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

@ParaskP7 ParaskP7 self-assigned this Apr 25, 2023
Copy link
Contributor

@ParaskP7 ParaskP7 left a 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. 👍

@oguzkocer
Copy link
Contributor Author

Thanks @ParaskP7 🙇‍♂️

@wpmobilebot
Copy link
Contributor

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
Versionpr18318-cab6f76
Commitcab6f76
Direct Downloadjetpack-prototype-build-pr18318-cab6f76.apk
Note: Google Login is not supported on these builds.

@wpmobilebot
Copy link
Contributor

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
Versionpr18318-cab6f76
Commitcab6f76
Direct Downloadwordpress-prototype-build-pr18318-cab6f76.apk
Note: Google Login is not supported on these builds.

The number of arguments for this string has been changed in #18315, so
these translations are no longer accurate and causing lint failures.
@oguzkocer
Copy link
Contributor Author

The number of arguments for site_creation_domain_cost has been updated which has resulted in a lint failure after cab6f76. I've tried to address this by removing the incorrect site_creation_domain_cost translations for es & de in 06d6645.

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.

@oguzkocer oguzkocer merged commit 993cc6b into trunk Apr 25, 2023
@oguzkocer oguzkocer deleted the merge/22.2-rc-3-to-trunk branch April 25, 2023 19:38
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.

5 participants