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

[beta] Backport #48252 #48340

Merged
merged 3 commits into from
Feb 19, 2018
Merged

[beta] Backport #48252 #48340

merged 3 commits into from
Feb 19, 2018

Conversation

Mark-Simulacrum
Copy link
Member

Backport of #48252. It fixes a critical failure in what we run on CI that was caught after we branched beta.

Mark-Simulacrum and others added 3 commits February 18, 2018 16:40
Primarily for CI purposes; this is intended to avoid cases where we
update rustbuild and unintentionally make CI stop running some builds to
the arguments being passed no longer applying for some reason.
We'd previously assumed that these paths would be relative to the src
dir, and that for example our various CI scripts would, when calling
x.py, use `../x.py build ../src/tools/...` but this isn't the case --
they use `../x.py` without using the relevant source-relative path.

We eventually may want to make this (actually somewhat logical) change,
but this is not that time.
@rust-highfive
Copy link
Collaborator

r? @alexcrichton

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

@rust-highfive
Copy link
Collaborator

warning Warning warning

  • Pull requests are usually filed against the master branch for this repo, but this one is against beta. Please double check that you specified the right target!

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Feb 18, 2018
@Mark-Simulacrum
Copy link
Member Author

@bors p=5

r? @kennytm

@kennytm
Copy link
Member

kennytm commented Feb 19, 2018

@bors r+

@bors
Copy link
Contributor

bors commented Feb 19, 2018

📌 Commit d64aee0 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-review Status: Awaiting review from the assignee but also interested parties. labels Feb 19, 2018
@bors
Copy link
Contributor

bors commented Feb 19, 2018

⌛ Testing commit d64aee0 with merge 5600a40c643261d2923e43213f34deb8081183dc...

@bors
Copy link
Contributor

bors commented Feb 19, 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 Feb 19, 2018
@kennytm
Copy link
Member

kennytm commented Feb 19, 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 Feb 19, 2018
@bors
Copy link
Contributor

bors commented Feb 19, 2018

⌛ Testing commit d64aee0 with merge 030fc63...

bors added a commit that referenced this pull request Feb 19, 2018
[beta] Backport #48252

Backport of #48252. It fixes a critical failure in what we run on CI that was caught after we branched beta.
@bors
Copy link
Contributor

bors commented Feb 19, 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 Feb 19, 2018
@kennytm
Copy link
Member

kennytm commented Feb 19, 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 Feb 19, 2018
@bors
Copy link
Contributor

bors commented Feb 19, 2018

⌛ Testing commit d64aee0 with merge 1e8fbb1...

bors added a commit that referenced this pull request Feb 19, 2018
[beta] Backport #48252

Backport of #48252. It fixes a critical failure in what we run on CI that was caught after we branched beta.
@bors
Copy link
Contributor

bors commented Feb 19, 2018

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

@bors bors merged commit d64aee0 into rust-lang:beta Feb 19, 2018
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.

5 participants