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

ci: Fix building disabled containers #44903

Closed
wants to merge 1 commit into from
Closed

ci: Fix building disabled containers #44903

wants to merge 1 commit into from

Conversation

kallisti5
Copy link
Contributor

  • Change the context into the disabled directory. Now you can test
    containers which are disabled.

@kallisti5
ci: Fix building disabled containers
3457a22 
* Change the context into the disabled directory. Now you can test
  containers which are disabled.
@rust-highfive
Copy link
Collaborator

r? @alexcrichton

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

@kallisti5 kallisti5 mentioned this pull request Sep 28, 2017
Closed
@alexcrichton
Copy link
Member

r? @aidanhs

I think you've got more context than I do on #44346

@aidanhs
Copy link
Member

aidanhs commented Sep 28, 2017

@bors r+ rollup

Thanks for the PR @kallisti5, and I'm sorry you found this a little frustrating - the changing of the sed expression was mainly because when I ran tar manually myself I was observing some very strange paths being inserted into the tar (like .\/somefile iirc). I just suggested the change of escape character because I tried it and it seemed to work - if you want to get the backslashes working I don't really have an objection!

@bors
Copy link
Contributor

bors commented Sep 28, 2017

📌 Commit 3457a22 has been approved by aidanhs

@alexcrichton alexcrichton added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Sep 28, 2017
Mark-Simulacrum added a commit to Mark-Simulacrum/rust that referenced this pull request Sep 29, 2017
@Mark-Simulacrum
Rollup merge of rust-lang#44903 - kallisti5:ci-build-disabled, r=aidanhs
d6451f0 
ci: Fix building disabled containers

* Change the context into the disabled directory. Now you can test
  containers which are disabled.
@Mark-Simulacrum Mark-Simulacrum mentioned this pull request Sep 29, 2017
Closed
bors added a commit that referenced this pull request Sep 30, 2017
@bors
Auto merge of #44936 - Mark-Simulacrum:rollup, r=Mark-Simulacrum
c4cca3a 
Rollup of 15 pull requests

- Successful merges: #44124, #44287, #44320, #44694, #44708, #44794, #44797, #44824, #44836, #44840, #44845, #44854, #44889, #44900, #44903
- Failed merges:
@bors
Copy link
Contributor

bors commented Sep 30, 2017

☔ The latest upstream changes (presumably #44936) made this pull request unmergeable. Please resolve the merge conflicts.

@Mark-Simulacrum
Copy link
Member

Merged in #44936.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@aidanhs aidanhs

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.
6 participants
@kallisti5 @rust-highfive @alexcrichton @aidanhs @bors @Mark-Simulacrum