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 rls #44176

Merged
merged 2 commits into from
Sep 3, 2017
Merged

Update rls #44176

merged 2 commits into from
Sep 3, 2017

Conversation

nrc
Copy link
Member

@nrc nrc commented Aug 30, 2017

And expose the CFG_VERSION env var to tools so they can determine the version of Rust.

This gets the RLS back on master and so completes the PR dance for the generators PR.

r? @alexcrichton

@alexcrichton
Copy link
Member

@bors: r+

@bors
Copy link
Contributor

bors commented Aug 30, 2017

📌 Commit 464091c has been approved by alexcrichton

@Mark-Simulacrum
Copy link
Member

I'm confused: This is exposing CFG_VERSION to tools, but I don't see it being used by RLS (based on the diff in this PR, at least). I'm fine with that being the case, but seem rather strange.

@alexcrichton
Copy link
Member

I believe the plan is to eventually use CFG_VERSION to affect the CLI-reported version of the rls. We're trying to move towards a model where the version reported from all CLI tools is the same (just different git revs)

@nrc
Copy link
Member Author

nrc commented Aug 31, 2017

@bors: r=alexcrichton (bumped RLS again)

@bors
Copy link
Contributor

bors commented Aug 31, 2017

📌 Commit 5eb478a has been approved by alexcrichton

@aidanhs aidanhs added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Aug 31, 2017
@bors
Copy link
Contributor

bors commented Sep 1, 2017

⌛ Testing commit 5eb478a with merge 4889a1501b30fe4b3b5a82b64b9b130136c39b36...

@bors
Copy link
Contributor

bors commented Sep 1, 2017

💔 Test failed - status-travis

@kennytm
Copy link
Member

kennytm commented Sep 1, 2017

@bors retry #44221 or #40474

check i686-apple-darwin failed to download LLVM archive.

[00:02:39] Attempting with retry: sh -c rm -f d9e7d2696e41983b6b5a0b4fac604b4e548a84d3.tar.gz &&             curl -sSL -O https://github.com/rust-lang/llvm/archive/d9e7d2696e41983b6b5a0b4fac604b4e548a84d3.tar.gz
No output has been received in the last 30m0s, this potentially indicates a stalled build or something wrong with the build itself.
Check the details on how to adjust your build configuration on: https://docs.travis-ci.com/user/common-build-problems/#Build-times-out-because-no-output-was-received
The build has been terminated

bors added a commit that referenced this pull request Sep 3, 2017
Update rls

And expose the `CFG_VERSION` env var to tools so they can determine the version of Rust.

This gets the RLS back on master and so completes the PR dance for the generators PR.

r? @alexcrichton
@bors
Copy link
Contributor

bors commented Sep 3, 2017

⌛ Testing commit 5eb478a with merge 5e9431a...

@bors
Copy link
Contributor

bors commented Sep 3, 2017

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

@bors bors merged commit 5eb478a into rust-lang:master Sep 3, 2017
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.

6 participants