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.

Sign up for GitHub

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

Jump to bottom

submodules: update rls from fed7a31 to 7010eee #67821

Merged
merged 1 commit into from
Jan 6, 2020
Merged

submodules: update rls from fed7a31 to 7010eee #67821

merged 1 commit into from
Jan 6, 2020

Conversation

matthiaskrgr
Copy link
Member

Changes:

Update Clippy
Update cargo.
Correct two links to the json-error-emitter

Fixes #67708

@rust-highfive
Copy link
Contributor

r? @nikomatsakis

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

@rust-highfive
Copy link
Contributor

⚠️ 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 Jan 3, 2020
@nikomatsakis
Copy link
Contributor

@bors r+

@bors
Copy link
Collaborator

bors commented Jan 3, 2020

📌 Commit 54024ed3fa8ac8811fb76aa28836bf6137d78d17 has been approved by nikomatsakis

@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 Jan 3, 2020
@oli-obk
Copy link
Contributor

oli-obk commented Jan 4, 2020

@bors p=1

@bors
Copy link
Collaborator

bors commented Jan 4, 2020

⌛ Testing commit 54024ed3fa8ac8811fb76aa28836bf6137d78d17 with merge 0adcebf23fa154f4c34ccb377b50ca5285881a7c...

@matthiaskrgr
Copy link
Member Author

Looks like RLS build broke again in the meantime, I'm preparing a fix.

@matthiaskrgr matthiaskrgr mentioned this pull request Jan 4, 2020
Merged
@rust-highfive
Copy link
Contributor

The job x86_64-gnu-tools of your PR failed (pretty log, 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. 
2020-01-04T17:43:02.8369815Z Verifying status of edition-guide...
2020-01-04T17:43:02.8369908Z Verifying status of rls...
2020-01-04T17:43:02.8370192Z This PR updated 'src/tools/rls', verifying if status is 'test-pass'...
2020-01-04T17:43:02.8370283Z 
2020-01-04T17:43:02.8370550Z We detected that this PR updated 'rls', but its tests failed.
2020-01-04T17:43:02.8370623Z 
2020-01-04T17:43:02.8370903Z If you do intend to update 'rls', please check the error messages above and
2020-01-04T17:43:02.8371007Z commit another update.
2020-01-04T17:43:02.8371052Z 
2020-01-04T17:43:02.8371347Z If you do NOT intend to update 'rls', please ensure you did not accidentally
2020-01-04T17:43:02.8371933Z change the submodule at 'src/tools/rls'. You may ask your reviewer for the
2020-01-04T17:43:02.8372020Z proper steps.
2020-01-04T17:43:02.8374836Z Build completed unsuccessfully in 0:00:01
2020-01-04T17:43:02.8423910Z == clock drift check ==
2020-01-04T17:43:02.8441792Z   local time: Sat Jan  4 17:43:02 UTC 2020
2020-01-04T17:43:03.1257980Z   network time: Sat, 04 Jan 2020 17:43:03 GMT
2020-01-04T17:43:03.1257980Z   network time: Sat, 04 Jan 2020 17:43:03 GMT
2020-01-04T17:43:03.1260522Z == end clock drift check ==
2020-01-04T17:43:04.3032662Z 
2020-01-04T17:43:04.3106484Z ##[error]Bash exited with code '1'.
2020-01-04T17:43:04.3156615Z ##[section]Starting: Checkout
2020-01-04T17:43:04.3159093Z ==============================================================================
2020-01-04T17:43:04.3159201Z Task         : Get sources
2020-01-04T17:43:04.3159286Z 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)

@bors
Copy link
Collaborator

bors commented Jan 4, 2020

💔 Test failed - checks-azure

@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 Jan 4, 2020
@Xanewok
Copy link
Member

Xanewok commented Jan 4, 2020

This should be unblocked now, as a fix has landed in the RLS repo.

@matthiaskrgr
submodules: update rls from fed7a31 to 7c0489c
fe26416 
Changes:
````
rustup rust-lang#67853
deps: update clippy
Update Clippy
Update cargo.
Correct two links to the json-error-emitter
````

Fixes rust-lang#67708
@matthiaskrgr
Copy link
Member Author

updated

@Xanewok
Copy link
Member

Xanewok commented Jan 5, 2020

@bors r+

@bors
Copy link
Collaborator

bors commented Jan 5, 2020

📌 Commit fe26416 has been approved by Xanewok

@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 Jan 5, 2020
@bors
Copy link
Collaborator

bors commented Jan 5, 2020

⌛ Testing commit fe26416 with merge 4782243cf0e256fb7d5a2ab217cb21994eaef712...

@rust-highfive
Copy link
Contributor

Your PR failed (pretty log, 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. 
2020-01-05T11:18:10.5831688Z upgrading pkgfile...
2020-01-05T11:18:10.6869851Z upgrading util-linux...
2020-01-05T11:18:11.1125780Z kill: 1813: No such process
2020-01-05T11:18:11.1128120Z kill: 1814: No such process
2020-01-05T12:01:18.9069659Z Chocolatey timed out waiting for the command to finish. The timeout 
2020-01-05T12:01:18.9071159Z  specified (or the default value) was '2700' seconds. Perhaps try a 
2020-01-05T12:01:18.9071269Z  higher `--execution-timeout`? See `choco -h` for details.
2020-01-05T12:01:19.6752332Z The install of msys2 was NOT successful.
2020-01-05T12:01:19.6768670Z Error while running 'C:\ProgramData\chocolatey\lib\msys2\tools\chocolateyinstall.ps1'.
2020-01-05T12:01:19.6769231Z  See log for details.
2020-01-05T12:01:21.7336804Z Chocolatey installed 0/1 packages. 1 packages failed.
2020-01-05T12:01:21.7337054Z  See the log for details (C:\ProgramData\chocolatey\logs\chocolatey.log).
2020-01-05T12:01:21.7342443Z 
2020-01-05T12:01:21.7347992Z Failures
2020-01-05T12:01:21.7347992Z Failures
2020-01-05T12:01:21.7355940Z  - msys2 (exited -1) - Error while running 'C:\ProgramData\chocolatey\lib\msys2\tools\chocolateyinstall.ps1'.
2020-01-05T12:01:21.7356083Z  See log for details.
2020-01-05T12:01:31.9300967Z The STDIO streams did not close within 10 seconds of the exit event from process 'C:\Program Files\Git\bin\bash.exe'. This may indicate a child process inherited the STDIO streams and has not yet exited.
2020-01-05T12:01:31.9371441Z ##[error]Bash exited with code '127'.
2020-01-05T12:01:36.9440693Z ##[section]Starting: Checkout
2020-01-05T12:01:36.9558873Z ==============================================================================
2020-01-05T12:01:36.9559052Z Task         : Get sources
2020-01-05T12:01:36.9559189Z 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)

@bors
Copy link
Collaborator

bors commented Jan 5, 2020

💔 Test failed - checks-azure

@bors bors removed the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Jan 5, 2020
@bors bors added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jan 5, 2020
@Mark-Simulacrum
Copy link
Member

@bors retry chocalatey kill no such process

@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 Jan 5, 2020
@bors
Copy link
Collaborator

bors commented Jan 5, 2020

⌛ Testing commit fe26416 with merge 0731573...

bors added a commit that referenced this pull request Jan 5, 2020
@bors
Auto merge of #67821 - matthiaskrgr:submodule_upd, r=Xanewok
0731573 
submodules: update rls from fed7a31 to 7010eee

Changes:
````
Update Clippy
Update cargo.
Correct two links to the json-error-emitter
````

Fixes #67708
@bors
Copy link
Collaborator

bors commented Jan 6, 2020

☀️ Test successful - checks-azure
Approved by: Xanewok
Pushing 0731573 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Jan 6, 2020
@bors bors merged commit fe26416 into rust-lang:master Jan 6, 2020
@rust-highfive
Copy link
Contributor

📣 Toolstate changed by #67821!

Tested on commit 0731573.
Direct link to PR: #67821

🎉 rls on windows: build-fail → test-pass (cc @Xanewok, @rust-lang/infra).
🎉 rls on linux: build-fail → test-pass (cc @Xanewok, @rust-lang/infra).

rust-highfive added a commit to rust-lang-nursery/rust-toolstate that referenced this pull request Jan 6, 2020
@rust-highfive
📣 Toolstate changed by rust-lang/rust#67821!
6c1e0c0 
Tested on commit rust-lang/rust@0731573.
Direct link to PR: <rust-lang/rust#67821>

🎉 rls on windows: build-fail → test-pass (cc @Xanewok, @rust-lang/infra).
🎉 rls on linux: build-fail → test-pass (cc @Xanewok, @rust-lang/infra).
@matthiaskrgr matthiaskrgr deleted the submodule_upd branch January 14, 2020 16:36
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@nikomatsakis nikomatsakis

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
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

rls no longer builds after rust-lang/rust#67661
7 participants
@matthiaskrgr @rust-highfive @nikomatsakis @bors @oli-obk @Xanewok @Mark-Simulacrum