Skip to content

Include missing tools in the manifest and mark them as unavailable #53715

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

Merged
merged 1 commit into from
Aug 27, 2018

Conversation

pietroalbini
Copy link
Member

This PR changes the build-manifest tool to always include the missing components in the manifest, marking them as available = false. This blocks rustup from updating to a different nightly if the component is installed.

The code builds and should be correct, but I don't know a way to test the changes locally.

r? @alexcrichton
cc @kennytm rust-lang/rustup#1486

@pietroalbini pietroalbini added the T-infra Relevant to the infrastructure team, which will review and decide on the PR/issue. label Aug 26, 2018
@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Aug 26, 2018
@alexcrichton
Copy link
Member

@bors: r+ p=1

@bors
Copy link
Collaborator

bors commented Aug 26, 2018

📌 Commit dc03139 has been approved by alexcrichton

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Aug 26, 2018
@bors
Copy link
Collaborator

bors commented Aug 26, 2018

⌛ Testing commit dc03139 with merge 51777b1...

bors added a commit that referenced this pull request Aug 26, 2018
…excrichton

Include missing tools in the manifest and mark them as unavailable

This PR changes the `build-manifest` tool to always include the missing components in the manifest, marking them as `available = false`. This blocks rustup from updating to a different nightly if the component is installed.

The code builds and _should_ be correct, but I don't know a way to test the changes locally.

r? @alexcrichton
cc @kennytm rust-lang/rustup#1486
@bors
Copy link
Collaborator

bors commented Aug 27, 2018

☀️ Test successful - status-appveyor, status-travis
Approved by: alexcrichton
Pushing 51777b1 to master...

@bors bors merged commit dc03139 into rust-lang:master Aug 27, 2018
@pietroalbini pietroalbini deleted the missing-components-manifest branch August 27, 2018 08:02
bors added a commit that referenced this pull request Aug 30, 2018
Fix manifests for broken tools: take 2

This is a follow up of #53715, to avoid stripping unavailable components from the extensions list. This time I also figured out how to test the changes, so the produced manifest is correct.

Along with the fix I added a README with instructions on how to test the tool, and a new `BUILD_MANIFEST_DISABLE_SIGNING` env var to avoid dealing with gpg while testing the tool. I chose an env var instead of a flag because it's more difficult to have it slip in by accident on CI, and there is also another protection that panics if that env var is set on CI, just to be sure we don't release unsigned artifacts.

r? @alexcrichton
cc rust-lang/rustup#1486
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-infra Relevant to the infrastructure team, which will review and decide on the PR/issue.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants