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.

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

[beta-1.81] fix(vendor): Strip excluded build targets #14368

Merged
merged 7 commits into from
Aug 7, 2024
Merged

[beta-1.81] fix(vendor): Strip excluded build targets #14368

merged 7 commits into from
Aug 7, 2024

Commits on Aug 7, 2024

  1. test: disable build-std test to unblock beta-1.81 backport

    @weihanglo @epage
    weihanglo authored and epage committed Aug 7, 2024
    Configuration menu
    Copy the full SHA
    17a0b7e View commit details
    Browse the repository at this point in the history

  2. Change tests to support rustc wording changes 

    Between rust-lang/rust#126810 and rust-lang/rust#126810 the output of rustc for resolution errors is going to change in such a way that some existing cargo tests will fail. Change them to support both the current and future output, so that those PRs can land in `rustc`.
    @estebank @epage
    estebank authored and epage committed Aug 7, 2024
    Configuration menu
    Copy the full SHA
    a15ec6a View commit details
    Browse the repository at this point in the history

  3. test(vendor): Clarify what vendor config is used

    @epage
    epage committed Aug 7, 2024
    Configuration menu
    Copy the full SHA
    505f1b9 View commit details
    Browse the repository at this point in the history

  4. test(vendor): Fork the package tests

    @epage
    epage committed Aug 7, 2024
    Configuration menu
    Copy the full SHA
    ccb4ac6 View commit details
    Browse the repository at this point in the history

  5. test(vendor): Drop explicitlu specified build-target cases 

    Since we already cover this for `cargo package` and we turn all
implicit targets into explicit targets (making implicit tests cover
explicit cases), this becomes redundant.
    @epage
    epage committed Aug 7, 2024
    Configuration menu
    Copy the full SHA
    b7223ba View commit details
    Browse the repository at this point in the history

  6. test(vendor): Port 'package' tests to 'vendor'

    @epage
    epage committed Aug 7, 2024
    Configuration menu
    Copy the full SHA
    567f66d View commit details
    Browse the repository at this point in the history

  7. fix(vendor): Strip excluded build targets 

    This is a **very** hacky solution, duplicating the minimum of what
`prepare_for_publish` does to fix this one issue and in the least
intrusive way to the vendor code.

The intention is to keep this low risk for backporting to beta and
stable.
We need to revisit this, refactoring the `cargo package` code so that we
can call into that for each vendored dependency.

Fixes rust-lang#14348
    @epage
    epage committed Aug 7, 2024
    Configuration menu
    Copy the full SHA
    78651cd View commit details
    Browse the repository at this point in the history