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

CLDR-18096 BRS 46.1 cherry-pick 46.1 changes from main to maint/maint-46, part 3 #4245

Conversation

pedberg-icu
Copy link
Contributor

@pedberg-icu pedberg-icu commented Dec 14, 2024

CLDR-18096

  • This PR completes the ticket.

This PR cherry-picks to the maint/maint-46 branch all of the 46.1 changes on the main branch from those in PR #4238 through commit 9263526 on Friday afternoon Dec 13. Those commits on main that are cherry-picked with this PR are:

Commit Commit merged Ticket Description
899a7ad 2024-12-11 13:03 CLDR-18170 BRS v46.1 first pass at release note update.
With this we also pick up other release note updates, see note below
57e30ca 2024-12-12 08:56 CLDR-18136 Fix datetimeSkeleton typo in yue

Note: With the release note cherry-pick we also pick up all of the other updates to the v46 download page that happened on the main branch after maint/maint-46 was created. This keeps the version of the release note that will be tagged for the 46.1 release in sync with the one that is actually published on the site.

Note: This should be merged with "Rebase and merge" (temporarily enable in Settings), not the usual "Squash and merge"

ALLOW_MANY_COMMITS=true
DISABLE_JIRA_ISSUE_MATCH=true

pedberg-icu and others added 2 commits December 13, 2024 18:29
)

(cherry picked from commit 899a7ad)
(also pick up changes in the main 46 release note after maint/maint-46 was branched)
@pedberg-icu
Copy link
Contributor Author

pedberg-icu commented Dec 14, 2024

Once this is approved and merged I can tag the maint/maint-46 branch with "release-46-1-beta3". And the failure in the "CLDR Site / cloudflare" task is expected and not an issue; that task only works on the main branch of the main cldr repo.

@pedberg-icu pedberg-icu merged commit 545666e into unicode-org:maint/maint-46 Dec 16, 2024
10 of 11 checks passed
@pedberg-icu pedberg-icu deleted the CLDR-18096-BRS46-1-cherry-pick-main-to-maint-part3 branch December 16, 2024 18:07
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.

3 participants