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

[beta] backport #48181 and #48362 #48793

Merged
merged 3 commits into from
Mar 9, 2018
Merged

[beta] backport #48181 and #48362 #48793

merged 3 commits into from
Mar 9, 2018

Conversation

cuviper
Copy link
Member

@cuviper cuviper commented Mar 6, 2018

No description provided.

michaelwoerister and others added 3 commits March 6, 2018 13:14
@michaelwoerister @cuviper
incr.comp.: Run cache directory garbage collection before loading dep…
e54a13d 
…-graph.
@cuviper
rustbuild: Restore Config.libdir_relative
a1af698 
This re-introduces a `Config.libdir_relative` field, now derived from
`libdir` and made relative to `prefix` if necessary.

This fixes a regression from rust-lang#46592 when `--libdir` is given an absolute
path.  `Builder::sysroot_libdir` should always use a relative path so
its callers don't clobber system locations, and `librustc` also asserts
that `CFG_LIBDIR_RELATIVE` is really relative.
@cuviper
rustbuild: make libdir_relative a method
62e9f2b
@cuviper
Copy link
Member Author

cuviper commented Mar 6, 2018

PR links since GitHub doesn't parse titles: #48181 #48362

@cuviper cuviper changed the title beta: backport #48181 and #48362 [beta] backport #48181 and #48362 Mar 6, 2018
@kennytm
Copy link
Member

kennytm commented Mar 7, 2018

@bors r+ p=2

@bors
Copy link
Contributor

bors commented Mar 7, 2018

📌 Commit 62e9f2b has been approved by kennytm

@bors bors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Mar 7, 2018
@bors
Copy link
Contributor

bors commented Mar 7, 2018

⌛ Testing commit 62e9f2b with merge ca13aa88580e29df49de51901c70f1b0caaa4b75...

@bors bors mentioned this pull request Mar 7, 2018
Merged
@bors
Copy link
Contributor

bors commented Mar 7, 2018

💔 Test failed - status-appveyor

@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 7, 2018
@alexcrichton
Copy link
Member

@bors: retry

standard timeouts

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

bors commented Mar 8, 2018

⌛ Testing commit 62e9f2b with merge 4b952c3c2cb15f6118af3c66d90f00d3fc90c780...

@bors
Copy link
Contributor

bors commented Mar 8, 2018

⌛ Testing commit 62e9f2b with merge 91b199a38e6c4deadbe2f24b67ce30e0b518b010...

@bors
Copy link
Contributor

bors commented Mar 8, 2018

💥 Test timed out

@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 8, 2018
@bors
Copy link
Contributor

bors commented Mar 8, 2018

💔 Test failed - status-travis

@kennytm
Copy link
Member

kennytm commented Mar 8, 2018

@bors retry

30-minute no output with check i686-apple-darwin

[02:15:35] test net::tcp::tests::fast_rebind ... test net::tcp::tests::fast_rebind has been running for over 60 seconds

[02:15:55] thread '<unnamed>' panicked at 'received error for `TcpStream::connect(&addr)`: Operation timed out (os error 60)', libstd/net/tcp.rs:1185:17



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

@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 8, 2018
@bors
Copy link
Contributor

bors commented Mar 8, 2018

⌛ Testing commit 62e9f2b with merge b064610a4d67f9844bb770390a6a1dd74bbba041...

@bors
Copy link
Contributor

bors commented Mar 8, 2018

💔 Test failed - status-appveyor

@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 8, 2018
@kennytm
Copy link
Member

kennytm commented Mar 8, 2018

@bors retry #46903

@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 8, 2018
@bors
Copy link
Contributor

bors commented Mar 8, 2018

⌛ Testing commit 62e9f2b with merge 9b8fb214506ee9b5dad1eb14aa6ec7ea49be1891...

@bors
Copy link
Contributor

bors commented Mar 8, 2018

💔 Test failed - status-appveyor

@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 8, 2018
@pietroalbini
Copy link
Member

@bors retry #46903

@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 8, 2018
@bors
Copy link
Contributor

bors commented Mar 9, 2018

⌛ Testing commit 62e9f2b with merge b89a2a4...

bors added a commit that referenced this pull request Mar 9, 2018
@bors
Auto merge of #48793 - cuviper:beta-1.25-backports, r=kennytm
b89a2a4 
[beta] backport #48181 and #48362

None
@bors
Copy link
Contributor

bors commented Mar 9, 2018

💔 Test failed - status-appveyor

@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 9, 2018
@oli-obk
Copy link
Contributor

oli-obk commented Mar 9, 2018

@bors retry #46903

@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 9, 2018
@bors
Copy link
Contributor

bors commented Mar 9, 2018

⌛ Testing commit 62e9f2b with merge 16262bb...

bors added a commit that referenced this pull request Mar 9, 2018
@bors
Auto merge of #48793 - cuviper:beta-1.25-backports, r=kennytm
16262bb 
[beta] backport #48181 and #48362

None
@bors
Copy link
Contributor

bors commented Mar 9, 2018

☀️ Test successful - status-appveyor, status-travis
Approved by: kennytm
Pushing 16262bb to beta...

@bors bors merged commit 62e9f2b into rust-lang:beta Mar 9, 2018
@cuviper cuviper deleted the beta-1.25-backports branch May 4, 2018 17:14
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
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.
7 participants
@cuviper @kennytm @bors @alexcrichton @pietroalbini @oli-obk @michaelwoerister