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] Rollup backports #78141

Merged
merged 12 commits into from
Oct 20, 2020
Merged

[beta] Rollup backports #78141

merged 12 commits into from
Oct 20, 2020

Commits on Oct 20, 2020

  1. bootstrap: always use the Rust version in package names 

    The format of the tarballs produced by CI is roughly the following:

    {component}-{release}-{target}.{ext}

While on the beta and nightly channels `{release}` is just the channel
name, on the stable channel is either the Rust version or the version of
the component we're shipping:

    cargo-0.47.0-x86_64-unknown-linux-gnu.tar.xz
    clippy-0.0.212-x86_64-unknown-linux-gnu.tar.xz
    llvm-tools-1.46.0-x86_64-unknown-linux-gnu.tar.xz
    miri-0.1.0-x86_64-unknown-linux-gnu.tar.xz
    rls-1.41.0-x86_64-unknown-linux-gnu.tar.xz
    rust-1.46.0-x86_64-unknown-linux-gnu.tar.xz
    ...

This makes it really hard to get the package URL without having access
to the manifest (and there is no manifest on ci-artifacts.rlo), as there
is no consistent version number to use.

This commit addresses the problem by always using the Rust version
number as `{release}` for the stable channel, regardless of the version
number of the component we're shipping. I chose that instead of "stable"
to avoid breaking the URL scheme *that* much.

Rustup should not be affected by this change, as it fetches the URLs
from the manifest. Unfortunately we don't have a way to test other
clients before making a stable release, as this change only affects the
stable channel.
    @pietroalbini
    pietroalbini committed Oct 20, 2020
    Configuration menu
    Copy the full SHA
    7715af5 View commit details
    Browse the repository at this point in the history

  2. rustc_parse: More precise spans for tuple.0.0

    @petrochenkov @pietroalbini
    petrochenkov authored and pietroalbini committed Oct 20, 2020
    Configuration menu
    Copy the full SHA
    e1e1c0e View commit details
    Browse the repository at this point in the history

  3. Update crossbeam-channel to avoid UB

    @mati865 @pietroalbini
    mati865 authored and pietroalbini committed Oct 20, 2020
    Configuration menu
    Copy the full SHA
    9961317 View commit details
    Browse the repository at this point in the history

  4. build-manifest: stop generating numbered channel names except for stable 

    This fixes numbered channel names being created for the nightly channel,
and once the root cause of this rides the trains, for beta.
    @pietroalbini
    pietroalbini committed Oct 20, 2020
    Configuration menu
    Copy the full SHA
    7701b0b View commit details
    Browse the repository at this point in the history

  5. build-manifest: accept the Rust version instead of the monorepo path 

    This commit changes the way build-manifest is invoked, to let it accept
the Rust version directly instead of requiring the path of the Rust
monorepo and letting build-manifest figure out the path on its own.

This allows to run build-manifest without a clone of the monorepo.
    @pietroalbini
    pietroalbini committed Oct 20, 2020
    Configuration menu
    Copy the full SHA
    c83642c View commit details
    Browse the repository at this point in the history

  6. bootstrap: add disabled by default build-manifest dist component

    @pietroalbini
    pietroalbini committed Oct 20, 2020
    Configuration menu
    Copy the full SHA
    380f541 View commit details
    Browse the repository at this point in the history

  7. bootstrap: add --include-default-paths to ./x.py

    @pietroalbini
    pietroalbini committed Oct 20, 2020
    Configuration menu
    Copy the full SHA
    e1a033a View commit details
    Browse the repository at this point in the history

  8. ci: also build the build-manifest component on dist-x86_64-linux

    @pietroalbini
    pietroalbini committed Oct 20, 2020
    Configuration menu
    Copy the full SHA
    1681743 View commit details
    Browse the repository at this point in the history

  9. build-manifest: allow configuring the number of threads

    @pietroalbini
    pietroalbini committed Oct 20, 2020
    Configuration menu
    Copy the full SHA
    bf81d42 View commit details
    Browse the repository at this point in the history

  10. build-manifest: use var_os instead of var to check if vars exist 

    This will prevent the tool mistakenly ignoring the variables if they
happen to contain non-utf8 data.
    @pietroalbini
    pietroalbini committed Oct 20, 2020
    Configuration menu
    Copy the full SHA
    45b5f50 View commit details
    Browse the repository at this point in the history

  11. build-manifest: bundle the rustc version in the binary

    @pietroalbini
    pietroalbini committed Oct 20, 2020
    Configuration menu
    Copy the full SHA
    0c294e2 View commit details
    Browse the repository at this point in the history

  12. bootstrap: set correct path for the build-manifest binary

    @pietroalbini
    pietroalbini committed Oct 20, 2020
    Configuration menu
    Copy the full SHA
    8918415 View commit details
    Browse the repository at this point in the history