Only use cargo-vendor if building from git sources#41047

cuviper · 2017-04-03T22:08:21Z

The only time we need to vendor sources is when building from git. If one is
building from a rustc source tarball, everything should already be in place.
This also matters for distros which do offline builds, as they can't install
cargo-vendor this way.

This adds a common Build::src_is_git flag, and then uses it in the dist-src
target to decide whether to install or use cargo-vendor at all.

Fixes #41042.

rust-highfive · 2017-04-03T22:08:33Z

r? @brson

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

cuviper · 2017-04-03T22:10:17Z

r? @alexcrichton

I'd also nominate this for beta as it's a slight regression from 1.16, which didn't try to access the network.

aidanhs · 2017-04-03T22:19:28Z

src/bootstrap/lib.rs

        };
        let rust_info = channel::GitInfo::new(&src);
        let cargo_info = channel::GitInfo::new(&src.join("cargo"));
+        let src_is_git = src.join(".git").is_dir();


This won't work if rust itself is a git submodule. Checking if .git exists at all would be an improvement.

Hmm, I thought it was better to be more precise, but I see your point. I'll check just for existence.

(i.e. using fs::metadata as before) edit: oops, didn't see your comment

Or Path::exists() is the same metadata check, but shorter. :)

alexcrichton · 2017-04-03T23:26:51Z

@bors: r+

Thanks @cuviper!

bors · 2017-04-03T23:26:52Z

📌 Commit 4d32ff4 has been approved by alexcrichton

durka · 2017-04-04T01:58:23Z

src/bootstrap/dist.rs

+        let mut has_cargo_vendor = false;
+        let mut cmd = Command::new(&build.cargo);
+        for line in output(cmd.arg("install").arg("--list")).lines() {
+            has_cargo_vendor |= line.starts_with("cargo-vendor ");


doesn't this allow the build to use an installed cargo-vendor of the wrong version?

Maybe so, but FWIW I didn't really change any of these lines, only their indentation.

arielb1 · 2017-04-04T19:46:44Z

beta-nominate this?

cuviper · 2017-04-04T19:52:42Z

Should I open a beta backport PR? It seems like you're rolling these in batches lately.
(It's an easy backport -- the diff applies cleanly as-is.)

alexcrichton · 2017-04-04T19:54:22Z

@cuviper yeah if you're willing please feel free! We'll batch up if necessary but it's not required.

cuviper · 2017-04-04T20:21:56Z

#41069 is for beta.

Only use cargo-vendor if building from git sources The only time we need to vendor sources is when building from git. If one is building from a rustc source tarball, everything should already be in place. This also matters for distros which do offline builds, as they can't install cargo-vendor this way. This adds a common `Build::src_is_git` flag, and then uses it in the dist-src target to decide whether to install or use `cargo-vendor` at all. Fixes rust-lang#41042.

Rollup of 9 pull requests - Successful merges: #40797, #41047, #41056, #41061, #41075, #41080, #41120, #41130, #41131 - Failed merges:

bors · 2017-04-07T18:15:43Z

⌛ Testing commit 4d32ff4 with merge 53f4bc3...

cuviper added 2 commits April 3, 2017 13:46

Add a common Build::src_is_git flag

3fb1a84

Only use cargo-vendor if building from git sources

e9cfc30

rust-highfive assigned brson Apr 3, 2017

rust-highfive assigned alexcrichton and unassigned brson Apr 3, 2017

aidanhs reviewed Apr 3, 2017

View reviewed changes

Loosen src_is_git to just check exists()

4d32ff4

durka reviewed Apr 4, 2017

View reviewed changes

alexcrichton added beta-accepted Accepted for backporting to the compiler in the beta channel. beta-nominated Nominated for backporting to the compiler in the beta channel. labels Apr 4, 2017

alexcrichton removed the beta-nominated Nominated for backporting to the compiler in the beta channel. label Apr 4, 2017

frewsxcv mentioned this pull request Apr 6, 2017

Rollup of 5 pull requests #41113

Closed

frewsxcv mentioned this pull request Apr 6, 2017

Rollup of 9 pull requests #41115

Closed

frewsxcv mentioned this pull request Apr 6, 2017

Rollup of 8 pull requests #41116

Closed

frewsxcv mentioned this pull request Apr 7, 2017

Rollup of 6 pull requests #41129

Closed

frewsxcv mentioned this pull request Apr 7, 2017

Rollup of 9 pull requests #41138

Merged

bors added a commit that referenced this pull request Apr 7, 2017

Auto merge of #41138 - frewsxcv:rollup, r=frewsxcv

53f4bc3

Rollup of 9 pull requests - Successful merges: #40797, #41047, #41056, #41061, #41075, #41080, #41120, #41130, #41131 - Failed merges:

bors merged commit 4d32ff4 into rust-lang:master Apr 7, 2017

cuviper deleted the src_is_git branch September 26, 2017 06:39

Uh oh!

Conversation

cuviper commented Apr 3, 2017

Uh oh!

rust-highfive commented Apr 3, 2017

Uh oh!

cuviper commented Apr 3, 2017

Uh oh!

aidanhs Apr 3, 2017

Choose a reason for hiding this comment

Uh oh!

cuviper Apr 3, 2017

Choose a reason for hiding this comment

Uh oh!

aidanhs Apr 3, 2017 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

cuviper Apr 3, 2017

Choose a reason for hiding this comment

Uh oh!

alexcrichton commented Apr 3, 2017

Uh oh!

bors commented Apr 3, 2017

Uh oh!

durka Apr 4, 2017

Choose a reason for hiding this comment

Uh oh!

cuviper Apr 4, 2017

Choose a reason for hiding this comment

Uh oh!

arielb1 commented Apr 4, 2017

Uh oh!

cuviper commented Apr 4, 2017

Uh oh!

alexcrichton commented Apr 4, 2017

Uh oh!

cuviper commented Apr 4, 2017

Uh oh!

bors commented Apr 7, 2017

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

8 participants

aidanhs Apr 3, 2017 •

edited

Loading