8000 ICU-23056 merge maint/maint-77 to main by markusicu · Pull Request #3436 · unicode-org/icu · GitHub
[go: up one dir, main page]
Skip to content

ICU-23056 merge maint/maint-77 to main #3436

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.

Sign up for GitHub

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

Jump to bottom
Merged
merged 12 commits into from
Mar 13, 2025
Merged

ICU-23056 merge maint/maint-77 to main #3436

merged 12 commits into from
Mar 13, 2025

Conversation

markusicu
Copy link
Member

Checklist

  • Required: Issue filed: ICU-23056
  • Required: The PR title must be prefixed with a JIRA Issue number. Example: "ICU-1234 Fix xyz"
  • Required: Each commit message must be prefixed with a JIRA Issue number. Example: "ICU-1234 Fix xyz"
  • Issue accepted (done by Technical Committee after discussion)
  • Tests included, if applicable
  • API docs and/or User Guide docs changed or added, if applicable

DISABLE_JIRA_ISSUE_MATCH=true
ALLOW_MANY_COMMITS=true

mihnita and others added 12 commits February 21, 2025 15:15
@mihnita
ICU-22922 BRS77 Fix version in release-icu4c-ubuntu.yml
7aae07a 
Will need a proper fix, but let's just release this for now.
@FrankYFTang
ICU-23060 Fix heap-buffer-overflow when UnicodeString size too large
8000
0b88b1c 
See #3416
@DraganBesevic
ICU-22923 Integrate CLDR 47 release beta2, part 1, binary files
c210730
@DraganBesevic
ICU-22923 Integrate CLDR 47 release beta2, part 2, data files
7931e6f
@DraganBesevic
ICU-22923 Integrate CLDR 47 release beta2, part 3, source and test files
19dd858
@DraganBesevic
ICU-22923 Integrate CLDR 47 release beta2, part 4, remove unused vari…
d6ca2ba 
…ables in tests
@FrankYFTang
ICU-23060 Fix TestLargeAppend
53adb4b 
Correct the test based on the kMaxCapacity
setToBogus on error
@mihnita
ICU-23064 Fix for POSIX_MADV_RANDOM undefined
443c8c5
@yumaoka
ICU-23067 Add test option to ignore runtime time zone data sensitive …
27cc39a 
…test.
@mihnita
ICU-22923 BRS_77_GA Update version number to 77.1 (No more -SNAPSHOT)
cc9adb6
@mihnita
ICU-22923 Workaround for addLikelySubtags(und-Latn-RS) bug
457157a
@markusicu
ICU-22923 ICU 77 release page updates
f23af97 
See #3432
@markusicu markusicu requested review from echeran and sffc March 13, 2025 21:36
@markusicu
Copy link
Member Author

@sffc @echeran I am trying my hand at merging the maintenance branch to main. Does this look right?

I did enable merge commits, and I have @mihnita watching over me before I push the merge button.

@sffc
Copy link
Member
sffc commented Mar 13, 2025

Yeah, it's easy when it is a clean merge: you just pick the correct source and target branches via the GitHub UI.

When you hit the actual merge button, in addition to creating a Merge Commit, make sure that you edit the suggested commit message to start with a Jira Ticket ID. There is no validation. (I think this is in the instructions)

@markusicu
Copy link
Member Author

When you hit the actual merge button, in addition to creating a Merge Commit, make sure that you edit the suggested commit message to start with a Jira Ticket ID. There is no validation. (I think this is in the instructions)

Thanks for the reminder. When I hit the button on the UI, I will get an entry box for that, right?

echeran
echeran approved these changes Mar 13, 2025
View reviewed changes
Copy link
Contributor
@echeran echeran left a comment

Choose a reason for hiding this comment

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

LGTM. Since there are no merge conflicts, it sounds like you just need to do the merge. Remember to complete the BRS instructions to temporary lift the restriction on merge commits, make the merge, and restore the restriction.

@sffc
Copy link
Member
sffc commented Mar 13, 2025

When you hit the actual merge button, in addition to creating a Merge Commit, make sure that you edit the suggested commit message to start with a Jira Ticket ID. There is no validation. (I think this is in the instructions)

Thanks for the reminder. When I hit the button on the UI, I will get an entry box for that, right?

Yes, you get an entry box.

@markusicu markusicu merged commit 72406ed into main Mar 13, 2025
125 of 126 checks passed
@markusicu markusicu mentioned this pull request Mar 13, 2025
Merged
6 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@echeran echeran echeran approved these changes

@mihnita mihnita mihnita approved these changes

@sffc sffc Awaiting requested review from sffc

Assignees

@mihnita mihnita

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
7 participants
@markusicu @sffc @echeran @mihnita @FrankYFTang @DraganBesevic @yumaoka
0