-
Notifications
You must be signed in to change notification settings - Fork 174
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
Backport #4615 (C++ header ambiguity fix) to 1.4 #4616
Merged
Manishearth
merged 7 commits into
unicode-org:release/1.4
from
Manishearth:backport-1.4
Feb 15, 2024
Merged
Backport #4615 (C++ header ambiguity fix) to 1.4 #4616
Manishearth
merged 7 commits into
unicode-org:release/1.4
from
Manishearth:backport-1.4
Feb 15, 2024
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This was referenced Feb 14, 2024
Would like some backport approval: |
sffc
reviewed
Feb 14, 2024
Manishearth
changed the title
Backport c++ header ambiguity fix to 1.4
Backport #4615 (C++ header ambiguity fix) to 1.4
Feb 14, 2024
It's concerning that CI doesn't run, build-test has this config and it ought to work: on:
push:
branches: [ main ]
pull_request:
branches: '*'
workflow_dispatch:
inputs:
nightly:
description: "Test on latest nightly"
required: true
default: false
type: boolean
schedule:
# Run nightly cronjob CI every day at 14 UTC / 6AM PST / 3PM CET
- cron: '0 14 * * *' |
Fixed it. |
I'm ok with test-tutorials being broken it's a weird job anyway |
Manishearth
added a commit
that referenced
this pull request
Feb 15, 2024
Fixes #4109 (via fix from rust-diplomat/diplomat#429) Backport in #4616 <!-- Thank you for your pull request to ICU4X! Reminder: try to use [Conventional Comments](https://conventionalcomments.org/) to make comments clearer. Please see https://github.com/unicode-org/icu4x/blob/main/CONTRIBUTING.md for general information on contributing to ICU4X. -->
Manishearth
added
discuss-priority
Discuss at the next ICU4X meeting
needs-approval
One or more stakeholders need to approve proposal
and removed
discuss-priority
Discuss at the next ICU4X meeting
labels
Feb 15, 2024
Wrong label. But we should definitely discuss it in today's call. |
Manishearth
force-pushed
the
backport-1.4
branch
from
February 15, 2024 18:40
d78f3c1
to
fa7bc6f
Compare
sffc
approved these changes
Feb 15, 2024
younies
approved these changes
Feb 15, 2024
Manishearth
removed
discuss-priority
Discuss at the next ICU4X meeting
needs-approval
One or more stakeholders need to approve proposal
labels
Feb 29, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Backports #4615 to 1.4