-
Notifications
You must be signed in to change notification settings - Fork 12.8k
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
rustbuild: Add manifest generation in-tree #39284
Conversation
r? @aturon (rust_highfive has picked a reviewer for you, use r? to override) |
I don't currently have a plan to test this on Travis, unfortunately. I could imagine that we build a manifest for the previous commit, but I figure we can add that later if necessary. r? @brson |
5ee5253
to
ed49cb7
Compare
☔ The latest upstream changes (presumably #39245) made this pull request unmergeable. Please resolve the merge conflicts. |
ed49cb7
to
dc864a8
Compare
This commit adds a new tool, `build-manifest`, which is used to generate a distribution manifest of all produced artifacts. This tool is intended to replace the `build-rust-manifest.py` script that's currently located on the buildmaster. The intention is that we'll have a builder which periodically: * Downloads all artifacts for a commit * Runs `./x.py dist hash-and-sign`. This will generate `sha256` and `asc` files as well as TOML manifests. * Upload all generated hashes and manifests to the directory the artifacts came from. * Upload *all* artifacts (tarballs and hashes and manifests) to an archived location. * If necessary, upload all artifacts to the main location. This script is intended to just be the second step here where orchestrating uploads and such will all happen externally from the build system itself.
dc864a8
to
9e8785f
Compare
self.package("cargo", &mut manifest.pkg, HOSTS); | ||
self.package("rust-mingw", &mut manifest.pkg, MINGW); | ||
self.package("rust-std", &mut manifest.pkg, TARGETS); | ||
self.package("rust-docs", &mut manifest.pkg, TARGETS); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
if we simply add rust-analysis here, will that get it manifested and known to rustup?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think we'd also need to add it to extensions
below, but other than that I think that's it. @brson how do you feel about throwing that in here? currently this is mostly just a straight port of the python script on the buildmaster.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I've submitted rust-lang-deprecated/rust-buildbot#150, so when that lands it would still be a straight port :-)
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
fbm
Looks great @bors r+ |
📌 Commit 9e8785f has been approved by |
rustbuild: Add manifest generation in-tree This commit adds a new tool, `build-manifest`, which is used to generate a distribution manifest of all produced artifacts. This tool is intended to replace the `build-rust-manifest.py` script that's currently located on the buildmaster. The intention is that we'll have a builder which periodically: * Downloads all artifacts for a commit * Runs `./x.py dist hash-and-sign`. This will generate `sha256` and `asc` files as well as TOML manifests. * Upload all generated hashes and manifests to the directory the artifacts came from. * Upload *all* artifacts (tarballs and hashes and manifests) to an archived location. * If necessary, upload all artifacts to the main location. This script is intended to just be the second step here where orchestrating uploads and such will all happen externally from the build system itself. cc #38531
💔 Test failed - status-travis |
@bors: retry
|
rustbuild: Add manifest generation in-tree This commit adds a new tool, `build-manifest`, which is used to generate a distribution manifest of all produced artifacts. This tool is intended to replace the `build-rust-manifest.py` script that's currently located on the buildmaster. The intention is that we'll have a builder which periodically: * Downloads all artifacts for a commit * Runs `./x.py dist hash-and-sign`. This will generate `sha256` and `asc` files as well as TOML manifests. * Upload all generated hashes and manifests to the directory the artifacts came from. * Upload *all* artifacts (tarballs and hashes and manifests) to an archived location. * If necessary, upload all artifacts to the main location. This script is intended to just be the second step here where orchestrating uploads and such will all happen externally from the build system itself. cc rust-lang#38531
This commit adds a new tool,
build-manifest
, which is used to generate adistribution manifest of all produced artifacts. This tool is intended to
replace the
build-rust-manifest.py
script that's currently located on thebuildmaster. The intention is that we'll have a builder which periodically:
./x.py dist hash-and-sign
. This will generatesha256
andasc
filesas well as TOML manifests.
from.
location.
This script is intended to just be the second step here where orchestrating
uploads and such will all happen externally from the build system itself.
cc #38531