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

Rebase LLVM to 8.0.0 final #59285

Merged
merged 1 commit into from
Mar 27, 2019
Merged

Rebase LLVM to 8.0.0 final #59285

merged 1 commit into from
Mar 27, 2019

Conversation

cuviper
Copy link
Member

@cuviper cuviper commented Mar 18, 2019

@rust-highfive
Copy link
Collaborator

⚠️ Warning ⚠️

  • These commits modify submodules.

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Mar 18, 2019
@alexcrichton
Copy link
Member

Want to update src/rustllvm/llvm-rebuild-trigger while you're at it?

Feel free to r=me with that in

@cuviper
Copy link
Member Author

cuviper commented Mar 18, 2019

Oops, updated! Was this not an issue on prior LLVM updates since then?

@bors r=alexcrichton

@bors
Copy link
Contributor

bors commented Mar 18, 2019

@cuviper: 🔑 Insufficient privileges: Not in reviewers

@Xanewok
Copy link
Member

Xanewok commented Mar 18, 2019

@bors delegate+ r=alexcrichton

@bors
Copy link
Contributor

bors commented Mar 18, 2019

📌 Commit 0dabf8c 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 Mar 18, 2019
@bors
Copy link
Contributor

bors commented Mar 18, 2019

✌️ @cuviper can now approve this pull request

@nikic
Copy link
Contributor

nikic commented Mar 19, 2019

What are the plans regarding LLVM updates from this point on? Will we stay on the LLVM 8 branch or go back to master now that the release is out?

@alexcrichton
Copy link
Member

@cuviper

Was this not an issue on prior LLVM updates since then?

It's never an issue for CI because we always build from scratch and let sccache cache. It's in theory always an issue for local users though because we don't clear out the cached llvm build directory unless this file changes.

Now that being said it's probably pretty trivial for us to clear out the build directory somewhat automatically if the llvm git commit changes or something like that. But for now it's what we have!

@nikic

What are the plans regarding LLVM updates from this point on? Will we stay on the LLVM 8 branch or go back to master now that the release is out?

I think we'll probably stick to the defacto policy we've had for awhile that for small features and updates we can cherry-pick to our own branch but if a major feature is needed we can upgrade the submodule.

@Centril
Copy link
Contributor

Centril commented Mar 26, 2019

@bors p=1

@bors
Copy link
Contributor

bors commented Mar 26, 2019

⌛ Testing commit 0dabf8c with merge d615b111ad3f43493f62248ea9adbf1e813a1c54...

@bors
Copy link
Contributor

bors commented Mar 26, 2019

💔 Test failed - checks-travis

@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 Mar 26, 2019
@rust-highfive
Copy link
Collaborator

The job dist-x86_64-apple of your PR failed on Travis (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.
[02:52:05]    Compiling crc32fast v1.1.2
[02:52:05] [RUSTC-TIMING] memoffset test:false 0.108
[02:52:05]    Compiling rayon-core v1.4.0
[02:52:06]    Compiling yaml-rust v0.3.5
The job exceeded the maximum time limit for jobs, and has been terminated.

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)

@jseyfried
Copy link
Contributor

@bors retry

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

bors commented Mar 27, 2019

⌛ Testing commit 0dabf8c with merge dd363d1...

bors added a commit that referenced this pull request Mar 27, 2019
@bors
Copy link
Contributor

bors commented Mar 27, 2019

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

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Mar 27, 2019
@bors bors merged commit 0dabf8c into rust-lang:master Mar 27, 2019
@cuviper cuviper deleted the llvm-8.0.0 branch March 27, 2019 22:19
bors added a commit that referenced this pull request Mar 29, 2019
replace llvm-rebuild-trigger with submodule commit hash

As mentioned in #59285.

This PR removes the need to update the `llvm-rebuild-trigger` file. Instead, the latest commit hash of the appropriate LLVM submodule will be stored in the stamp file and used to detect if a build is required.

Fixes #42405.
Fixes #54959.
Fixes #55537.
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.

8 participants