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

rustbuild: Add manifest generation in-tree #39284

Merged
merged 1 commit into from
Jan 28, 2017

Conversation

alexcrichton
Copy link
Member

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

@rust-highfive
Copy link
Collaborator

r? @aturon

(rust_highfive has picked a reviewer for you, use r? to override)

@alexcrichton
Copy link
Member Author

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

@bors
Copy link
Contributor

bors commented Jan 25, 2017

☔ The latest upstream changes (presumably #39245) made this pull request unmergeable. Please resolve the merge conflicts.

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.
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);
Copy link
Member

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?

Copy link
Member Author

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.

Copy link
Member

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 :-)

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fbm

@brson
Copy link
Contributor

brson commented Jan 26, 2017

Looks great @bors r+

@bors
Copy link
Contributor

bors commented Jan 26, 2017

📌 Commit 9e8785f has been approved by brson

bors added a commit that referenced this pull request Jan 27, 2017
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
@bors
Copy link
Contributor

bors commented Jan 27, 2017

⌛ Testing commit 9e8785f with merge 95839b1...

@bors
Copy link
Contributor

bors commented Jan 27, 2017

💔 Test failed - status-travis

@alexcrichton
Copy link
Member Author

@bors: retry

alexcrichton added a commit to alexcrichton/rust that referenced this pull request Jan 28, 2017
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
bors added a commit that referenced this pull request Jan 28, 2017
@bors bors merged commit 9e8785f into rust-lang:master Jan 28, 2017
@alexcrichton alexcrichton deleted the manifesting branch February 11, 2017 18:38
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.

6 participants