Skip to content

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

Merged
alexcrichton merged 2 commits into
rust-lang:betafrom
Keruspe:beta
Mar 13, 2018
Merged

[beta] rustbuild: pass datadir to rust-installer#48930
alexcrichton merged 2 commits into
rust-lang:betafrom
Keruspe:beta

Conversation

@Keruspe

@KeruspeKeruspe commented Mar 11, 2018

Copy link
Copy Markdown
Contributor

Backport from #48295

@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>
@kennytmkennytm added the S-blocked Status: Blocked on something else such as an RFC or other implementation work. label Mar 11, 2018
@kennytm

kennytm commented Mar 11, 2018

Copy link
Copy Markdown
Member

Blocked until #48295 has been merged.

@Keruspe

Keruspe commented Mar 12, 2018

Copy link
Copy Markdown
ContributorAuthor

@kennytm looks like #48295 finally passed

@emilyalbiniemilyalbini 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
@emilyalbini

emilyalbini commented Mar 12, 2018

Copy link
Copy Markdown
Member

r? @kennytm

@kennytm

kennytm commented Mar 12, 2018

Copy link
Copy Markdown
Member

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

@kennytmkennytm 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

Keruspe commented Mar 12, 2018

Copy link
Copy Markdown
ContributorAuthor

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

kennytm commented Mar 12, 2018

Copy link
Copy Markdown
Member

@bors r+

@bors

bors commented Mar 12, 2018

Copy link
Copy Markdown
Collaborator

📌 Commit 57d1ab9 has been approved by kennytm

@borsbors 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

kennytm commented Mar 12, 2018

Copy link
Copy Markdown
Member

@bors p=2

@bors

bors commented Mar 12, 2018

Copy link
Copy Markdown
Collaborator

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

@bors

bors commented Mar 12, 2018

Copy link
Copy Markdown
Collaborator

💔 Test failed - status-appveyor

@borsbors 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
@emilyalbini

emilyalbini commented Mar 12, 2018

Copy link
Copy Markdown
Member

@bors retry #46903

@borsbors 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

bors commented Mar 13, 2018

Copy link
Copy Markdown
Collaborator

⌛ Testing commit 57d1ab9 with merge f370ea21e7a529f5d243ed34d12ee6a85f064c2b...

@bors

bors commented Mar 13, 2018

Copy link
Copy Markdown
Collaborator

💔 Test failed - status-appveyor

@borsbors 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
@emilyalbini

emilyalbini commented Mar 13, 2018

Copy link
Copy Markdown
Member

@bors retry #46903

@borsbors 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

bors commented Mar 13, 2018

Copy link
Copy Markdown
Collaborator

⌛ 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

bors commented Mar 13, 2018

Copy link
Copy Markdown
Collaborator

💔 Test failed - status-appveyor

@borsbors 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

alexcrichton commented Mar 13, 2018

Copy link
Copy Markdown
Member

All dist jobs passed, merging manually

@emilyalbini

emilyalbini commented Mar 13, 2018

Copy link
Copy Markdown
Member

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

@bors retry

@borsbors 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:betaMar 13, 2018
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

@kennytmkennytm

Labels

S-waiting-on-borsStatus: 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@emilyalbini@bors@alexcrichton