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

Backport #4615 (C++ header ambiguity fix) to 1.4 #4616

Merged
merged 7 commits into from
Feb 15, 2024

Conversation

Manishearth
Copy link
Member

Backports #4615 to 1.4

@Manishearth
Copy link
Member Author

Manishearth commented Feb 14, 2024

Would like some backport approval:

@Manishearth Manishearth changed the title Backport c++ header ambiguity fix to 1.4 Backport #4615 (C++ header ambiguity fix) to 1.4 Feb 14, 2024
@Manishearth Manishearth reopened this Feb 14, 2024
@Manishearth
Copy link
Member Author

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 * * *'

@Manishearth
Copy link
Member Author

Fixed it.

@Manishearth
Copy link
Member Author

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 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
@Manishearth
Copy link
Member Author

Wrong label. But we should definitely discuss it in today's call.

@Manishearth Manishearth added the discuss-priority Discuss at the next ICU4X meeting label Feb 15, 2024
@Manishearth Manishearth merged commit bcf4f71 into unicode-org:release/1.4 Feb 15, 2024
27 of 28 checks passed
@Manishearth Manishearth deleted the backport-1.4 branch February 15, 2024 20:23
@Manishearth 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
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants