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

Update cargo-vendor usage #62549

Merged
merged 1 commit into from
Jul 12, 2019
Merged

Update cargo-vendor usage #62549

merged 1 commit into from
Jul 12, 2019

Conversation

ehuss
Copy link
Contributor

@ehuss ehuss commented Jul 9, 2019

This contains a variety of updates to clean up the usage of cargo-vendor.

  • Remove the install step for the old cargo-vendor now that it is built-in to cargo and available in the stage0 install.
  • Update installation instructions, dealing with vendoring. The current instructions of running sudo ./x.py install is broken, it will almost always fail (since the vendor directory doesn't exist). Since the steps for properly handling this are numerous, I'm recommending removing the suggestion to use sudo altogether.
  • If the sudo-forced-vendoring detects that the vendor directory is not available, abort with instructions on how to fix.
  • Now that cargo-vendor is built-in, automatically run it if it looks like it is needed.
  • Update instructions on how to install cargo.
  • Remove the unused markdown link references in README/CONTRIBUTING. This reverts most of Add links to headers in README and CONTRIBUTING #44935. These references don't do anything if they are unused.

Closes #49269
cc #61142 #48771 #40108

@rust-highfive
Copy link
Collaborator

r? @alexcrichton

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

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jul 9, 2019
the compiler. More information about it may be found by running `./x.py --help`
or reading the [rustc guide][rustcguidebuild].

[rustcguidebuild]: https://rust-lang.github.io/rustc-guide/how-to-build-and-run.html

### Building on *nix
Copy link
Contributor

Choose a reason for hiding this comment

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

Could you escape the * to \* ? The * doesn't affect the rendered output but when review I see this
image
which is annoying.

@alexcrichton
Copy link
Member

@bors: r+

Thanks @ehuss!

@bors
Copy link
Contributor

bors commented Jul 10, 2019

📌 Commit 06c3256 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 Jul 10, 2019
@bors
Copy link
Contributor

bors commented Jul 11, 2019

⌛ Testing commit 06c3256 with merge 4da4deb...

bors added a commit that referenced this pull request Jul 11, 2019
Update cargo-vendor usage

This contains a variety of updates to clean up the usage of cargo-vendor.

- Remove the install step for the old cargo-vendor now that it is built-in to cargo and available in the stage0 install.
- Update installation instructions, dealing with vendoring. The current instructions of running `sudo ./x.py install` is broken, it will almost always fail (since the vendor directory doesn't exist). Since the steps for properly handling this are numerous, I'm recommending removing the suggestion to use `sudo` altogether.
- If the sudo-forced-vendoring detects that the vendor directory is not available, abort with instructions on how to fix.
- Now that cargo-vendor is built-in, automatically run it if it looks like it is needed.
- Update instructions on how to install cargo.
- Remove the unused markdown link references in README/CONTRIBUTING. This reverts most of #44935. These references don't do anything if they are unused.

Closes #49269
cc #61142 #48771 #40108
@bors
Copy link
Contributor

bors commented Jul 11, 2019

💔 Test failed - checks-azure

@bors bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Jul 11, 2019
@alexcrichton
Copy link
Member

@bors: retry

azure build was killed

@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 Jul 11, 2019
@bors
Copy link
Contributor

bors commented Jul 12, 2019

⌛ Testing commit 06c3256 with merge cd1381e...

bors added a commit that referenced this pull request Jul 12, 2019
Update cargo-vendor usage

This contains a variety of updates to clean up the usage of cargo-vendor.

- Remove the install step for the old cargo-vendor now that it is built-in to cargo and available in the stage0 install.
- Update installation instructions, dealing with vendoring. The current instructions of running `sudo ./x.py install` is broken, it will almost always fail (since the vendor directory doesn't exist). Since the steps for properly handling this are numerous, I'm recommending removing the suggestion to use `sudo` altogether.
- If the sudo-forced-vendoring detects that the vendor directory is not available, abort with instructions on how to fix.
- Now that cargo-vendor is built-in, automatically run it if it looks like it is needed.
- Update instructions on how to install cargo.
- Remove the unused markdown link references in README/CONTRIBUTING. This reverts most of #44935. These references don't do anything if they are unused.

Closes #49269
cc #61142 #48771 #40108
@bors
Copy link
Contributor

bors commented Jul 12, 2019

☀️ Test successful - checks-azure, checks-travis, status-appveyor
Approved by: alexcrichton
Pushing cd1381e to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Jul 12, 2019
@bors bors merged commit 06c3256 into rust-lang:master Jul 12, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
merged-by-bors This PR was explicitly merged by bors. S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

error: failed to load source for a dependency on 'cc'
5 participants