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

ICU-22922 Merge maint/maint-76 to main #3270

Merged
merged 1 commit into from
Nov 19, 2024
Merged

ICU-22922 Merge maint/maint-76 to main #3270

merged 1 commit into from
Nov 19, 2024

Conversation

sffc
Copy link
Member

@sffc sffc commented Nov 16, 2024

@sffc sffc requested a review from markusicu November 16, 2024 00:51
Copy link
Member

@markusicu markusicu left a comment

Choose a reason for hiding this comment

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

thank you!

@markusicu
Copy link
Member

So... this was supposed to be a routine merge of the straggler maint/maint-76 CLDR-to-ICU integration commit from @DraganBesevic 's #3260 to main.

However, we have two types of check failures here:

  1. There is a C++ exhaustive intltest failure from utility/LocaleTest/TestDataDrivenLikelySubtags. This is the same test failure that we have been seeing on main already, so it's not a regression from this commit. I was hoping that this failure would get fixed with integrating the late CLDR 46 likely subtags change, but no :-/

Since this is not a regression from this PR, I propose that we ignore it for this PR.
We do need to debug & fix it on main, but not in a merge-from-maint PR.

  1. Three of the nine MSVC checks fail with this:
"D:\a\icu\icu\icu4c\source\allinone\allinone.sln" (default target) (1) ->
"D:\a\icu\icu\icu4c\source\data\makedata_uwp.vcxproj" (default target) (56) ->
  C:\Program Files\Microsoft Visual Studio\2022\Enterprise\MSBuild\Microsoft\VisualStudio\v17.0\AppxPackage\Microsoft.AppXPackage.Targets(225,25): error MSB4184: The expression "[MSBuild]::VersionGreaterThanOrEquals('', 9.0)" cannot be evaluated. Version string was not in a correct format. [D:\a\icu\icu\icu4c\source\data\makedata_uwp.vcxproj]

This looks like an MSVC config bug, unrelated to this PR. I propose that we ignore this, too, for now.
I will restart these checks to see if they were flakes.

@rp9-next @richgillam ok to ignore these and let Shane merge?

@richgillam
Copy link
Contributor

richgillam commented Nov 18, 2024 via email

@markusicu
Copy link
Member

Thanks, Rick.
I reran some of the MSVC checks once or twice, and they keep failing. But I don't see how these failures could be related to these changes.
We need to put a lid on ICU 76 and focus on fixing problems on main.
@sffc please merge.

@sffc sffc merged commit d6f8a14 into main Nov 19, 2024
207 of 213 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants