Skip to content

Conversation

cuviper
Copy link
Member

@cuviper cuviper commented Mar 30, 2019

Fixes #59565

@rust-highfive
Copy link
Contributor

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 Mar 30, 2019
@cuviper
Copy link
Member Author

cuviper commented Mar 30, 2019

r? @Mark-Simulacrum

@cuviper
Copy link
Member Author

cuviper commented Mar 30, 2019

Hmm, except "dev" builds ignore git, which isn't what we want for LLVM...

let default = config.channel == "dev";
config.ignore_git = ignore_git.unwrap_or(default);

@Mark-Simulacrum
Copy link
Member

I'm not sure, but perhaps we could add an argument to GitInfo new or something along those lines that would usually be the config.ignore_git but for LLVM just true.

@cuviper
Copy link
Member Author

cuviper commented Mar 30, 2019

I just pushed a commit which roughly does that -- passing ignore_git: bool instead of &Config, always false for LLVM dirs.

@Mark-Simulacrum
Copy link
Member

Looks good to me! Bumping priority since this fixes a regression.

@bors r+ p=1

@bors
Copy link
Collaborator

bors commented Mar 30, 2019

📌 Commit 49b65e6 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 Mar 30, 2019
@bors
Copy link
Collaborator

bors commented Mar 31, 2019

⌛ Testing commit 49b65e6 with merge cee58fd...

bors added a commit that referenced this pull request Mar 31, 2019
Use the existing LLVM GitInfo for checking rebuilds

Fixes #59565
@bors
Copy link
Collaborator

bors commented Mar 31, 2019

☀️ Test successful - checks-travis, status-appveyor
Approved by: Mark-Simulacrum
Pushing cee58fd to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Mar 31, 2019
@bors bors merged commit 49b65e6 into rust-lang:master Mar 31, 2019
@cuviper cuviper deleted the llvm-rebuild-sha branch May 17, 2019 21:50
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.

5 participants