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

check git in bootstrap.py #64278

Merged
merged 1 commit into from
Sep 9, 2019
Merged

check git in bootstrap.py #64278

merged 1 commit into from
Sep 9, 2019

Conversation

guanqun
Copy link
Contributor

@guanqun guanqun commented Sep 8, 2019

No description provided.

@rust-highfive
Copy link
Collaborator

r? @nikomatsakis

(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 Sep 8, 2019
@guanqun
Copy link
Contributor Author

guanqun commented Sep 8, 2019

in some cases when my path is misconfigured. the error output is very confusing. we'd better check it beforehand.

@Centril
Copy link
Contributor

Centril commented Sep 8, 2019

r? @pietroalbini

@Mark-Simulacrum
Copy link
Member

Do we require git even when building from a tarball? I'd sort of expect that we shouldn't, though perhaps we do today...

@pietroalbini
Copy link
Member

r? @Mark-Simulacrum

@Mark-Simulacrum
Copy link
Member

r=me with that question answered in positive, otherwise I think we should not do this

@guanqun
Copy link
Contributor Author

guanqun commented Sep 9, 2019

good point. I see that at least in bootstrap.py file, git is only used for updating the submodules. so the place to check it is moved. please help review again.

@guanqun
Copy link
Contributor Author

guanqun commented Sep 9, 2019

the tarball from release tab doesn't compile out of box as it's missing these submodules.

@rust-highfive
Copy link
Collaborator

The job x86_64-gnu-llvm-6.0 of your PR failed (raw log). Through arcane magic we have determined that the following fragments from the build log may contain information about the problem.

Click to expand the log.
2019-09-09T05:13:19.4711106Z ##[command]git remote add origin https://github.com/rust-lang/rust
2019-09-09T05:13:19.4899307Z ##[command]git config gc.auto 0
2019-09-09T05:13:19.4966376Z ##[command]git config --get-all http.https://github.com/rust-lang/rust.extraheader
2019-09-09T05:13:19.5016401Z ##[command]git config --get-all http.proxy
2019-09-09T05:13:19.5150777Z ##[command]git -c http.extraheader="AUTHORIZATION: basic ***" fetch --force --tags --prune --progress --no-recurse-submodules --depth=2 origin +refs/heads/*:refs/remotes/origin/* +refs/pull/64278/merge:refs/remotes/pull/64278/merge
---
2019-09-09T05:19:52.6630551Z    Compiling serde_json v1.0.40
2019-09-09T05:19:54.2355076Z    Compiling tidy v0.1.0 (/checkout/src/tools/tidy)
2019-09-09T05:20:03.8993698Z     Finished release [optimized] target(s) in 1m 19s
2019-09-09T05:20:03.9063668Z tidy check
2019-09-09T05:20:04.6136336Z tidy error: /checkout/src/bootstrap/bootstrap.py:716: line longer than 100 chars
2019-09-09T05:20:05.6167283Z some tidy checks failed
2019-09-09T05:20:05.6167425Z 
2019-09-09T05:20:05.6167425Z 
2019-09-09T05:20:05.6176147Z command did not execute successfully: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage0-tools-bin/tidy" "/checkout/src" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage0/bin/cargo" "--no-vendor"
2019-09-09T05:20:05.6181533Z 
2019-09-09T05:20:05.6181556Z 
2019-09-09T05:20:05.6192847Z failed to run: /checkout/obj/build/bootstrap/debug/bootstrap test src/tools/tidy
2019-09-09T05:20:05.6192906Z Build completed unsuccessfully in 0:01:22
2019-09-09T05:20:05.6192906Z Build completed unsuccessfully in 0:01:22
2019-09-09T05:20:05.6241141Z == clock drift check ==
2019-09-09T05:20:05.6253368Z   local time: Mon Sep  9 05:20:05 UTC 2019
2019-09-09T05:20:05.7115307Z   network time: Mon, 09 Sep 2019 05:20:05 GMT
2019-09-09T05:20:05.7121441Z == end clock drift check ==
2019-09-09T05:20:07.1732678Z ##[error]Bash exited with code '1'.
2019-09-09T05:20:07.1764560Z ##[section]Starting: Checkout
2019-09-09T05:20:07.1766635Z ==============================================================================
2019-09-09T05:20:07.1766697Z Task         : Get sources
2019-09-09T05:20:07.1766953Z Description  : Get sources from a repository. Supports Git, TfsVC, and SVN repositories.

I'm a bot! I can only do what humans tell me to, so if this was not helpful or you have suggestions for improvements, please ping or otherwise contact @TimNN. (Feature Requests)

@mati865
Copy link
Contributor

mati865 commented Sep 9, 2019

@guanqun I think they aren't meant to be used like that. You can find proper tarballs here https://forge.rust-lang.org/other-installation-methods.html#source

@Mark-Simulacrum
Copy link
Member

r=me with tidy fixed, I think it's fine to land this if it only runs when we'd run git anyway

@guanqun
Copy link
Contributor Author

guanqun commented Sep 9, 2019

Thank you @Mark-Simulacrum The tidy error is fixed.

@Mark-Simulacrum
Copy link
Member

@bors r+ rollup

@bors
Copy link
Contributor

bors commented Sep 9, 2019

📌 Commit b117bd7 has been approved by Mark-Simulacrum

@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 Sep 9, 2019
Centril added a commit to Centril/rust that referenced this pull request Sep 9, 2019
bors added a commit that referenced this pull request Sep 9, 2019
Rollup of 5 pull requests

Successful merges:

 - #63468 (Resolve attributes in several places)
 - #64121 (Override `StepBy::{try_fold, try_rfold}`)
 - #64278 (check git in bootstrap.py)
 - #64306 (Fix typo in config.toml.example)
 - #64312 (Unify escape usage)

Failed merges:

r? @ghost
@bors bors merged commit b117bd7 into rust-lang:master Sep 9, 2019
@guanqun guanqun deleted the check-git branch September 9, 2019 23:25
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.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants