Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Jump to bottom

[beta] rustbuild: pass datadir to rust-installer #48930

Merged
merged 2 commits into from
Mar 13, 2018
Merged

[beta] rustbuild: pass datadir to rust-installer #48930

merged 2 commits into from
Mar 13, 2018

Conversation

Keruspe
Copy link
Contributor

@Keruspe Keruspe commented Mar 11, 2018

Backport from #48295

Keruspe added 2 commits March 11, 2018 13:32
@Keruspe
update rust-installer submodule
1c69269 
Signed-off-by: Marc-Antoine Perennou <Marc-Antoine@Perennou.com>
@Keruspe
bootstrap: pass datadir to rust-installer
57d1ab9 
Signed-off-by: Marc-Antoine Perennou <Marc-Antoine@Perennou.com>
@kennytm kennytm added the S-blocked Status: Blocked on something else such as an RFC or other implementation work. label Mar 11, 2018
@kennytm
Copy link
Member

kennytm commented Mar 11, 2018

Blocked until #48295 has been merged.

@Keruspe
Copy link
Contributor Author

Keruspe commented Mar 12, 2018

@kennytm looks like #48295 finally passed

@pietroalbini pietroalbini added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-blocked Status: Blocked on something else such as an RFC or other implementation work. labels Mar 12, 2018
@pietroalbini
Copy link
Member

r? @kennytm

@kennytm
Copy link
Member

kennytm commented Mar 12, 2018

You have updated the rust-installer submodule in this backport. Is this expected?

@kennytm kennytm added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Mar 12, 2018
@Keruspe
Copy link
Contributor Author

Keruspe commented Mar 12, 2018

It was updated in the original pull request too. Another pull request updating it further was merged before, that's why there was only the other commit left in the end.
The rustbuild commit is a noop if the rust-installer isnt' updated as well

@kennytm
Copy link
Member

kennytm commented Mar 12, 2018

@bors r+

@bors
Copy link
Contributor

bors commented Mar 12, 2018

📌 Commit 57d1ab9 has been approved by kennytm

@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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Mar 12, 2018
@kennytm
Copy link
Member

kennytm commented Mar 12, 2018

@bors p=2

@bors
Copy link
Contributor

bors commented Mar 12, 2018

⌛ Testing commit 57d1ab9 with merge 1ce3bfa4ed8d65f63bcdc803979a3e0908fabc6a...

@bors
Copy link
Contributor

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

bors commented Mar 13, 2018

⌛ Testing commit 57d1ab9 with merge f370ea21e7a529f5d243ed34d12ee6a85f064c2b...

@bors
Copy link
Contributor

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

bors commented Mar 13, 2018

⌛ Testing commit 57d1ab9 with merge de97991...

bors added a commit that referenced this pull request Mar 13, 2018
@bors
Auto merge of #48930 - Keruspe:beta, r=kennytm
de97991 
[beta] rustbuild: pass datadir to rust-installer

Backport from #48295
@bors
Copy link
Contributor

bors commented Mar 13, 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 13, 2018
@alexcrichton
Copy link
Member

All dist jobs passed, merging manually

@pietroalbini
Copy link
Member

Uh, third time in a row appveyor timed out...

@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 13, 2018
@alexcrichton alexcrichton merged commit 57d1ab9 into rust-lang:beta Mar 13, 2018
# for free to join this conversation on GitHub. Already have an account? # to comment
Reviewers
No reviews
Assignees

@kennytm kennytm

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.
5 participants
@Keruspe @kennytm @pietroalbini @bors @alexcrichton