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

Disable tinyfiledialogs on non-OS X and Linux platforms. #10650

Merged
merged 1 commit into from
Apr 16, 2016

Conversation

jdm
Copy link
Member

@jdm jdm commented Apr 16, 2016

I haven't been able to fix the appveyor build yet, so this gives us back a usable Windows build.


This change is Reviewable

@highfive
Copy link

Heads up! This PR modifies the following files:

  • @KiChjang: components/net/Cargo.toml, components/net/lib.rs, components/net/http_loader.rs

@highfive
Copy link

warning Warning warning

  • These commits modify net code, but no tests are modified. Please consider adding a test!

@highfive highfive added the S-awaiting-review There is new code that needs to be reviewed. label Apr 16, 2016
@KiChjang
Copy link
Contributor

@bors-servo r+

@bors-servo
Copy link
Contributor

📌 Commit 19612e0 has been approved by KiChjang

@highfive highfive added S-awaiting-merge The PR is in the process of compiling and running tests on the automated CI. and removed S-awaiting-review There is new code that needs to be reviewed. labels Apr 16, 2016
@KiChjang KiChjang assigned KiChjang and unassigned nox Apr 16, 2016
@bors-servo
Copy link
Contributor

⌛ Testing commit 19612e0 with merge 2a9fbd4...

bors-servo pushed a commit that referenced this pull request Apr 16, 2016
Disable tinyfiledialogs on non-OS X and Linux platforms.

I haven't been able to fix the appveyor build yet, so this gives us back a usable Windows build.

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="35" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/10650)
<!-- Reviewable:end -->
@bors-servo
Copy link
Contributor

💔 Test failed - linux-dev

@highfive highfive added S-tests-failed The changes caused existing tests to fail. and removed S-awaiting-merge The PR is in the process of compiling and running tests on the automated CI. labels Apr 16, 2016
@highfive highfive added S-awaiting-review There is new code that needs to be reviewed. and removed S-tests-failed The changes caused existing tests to fail. labels Apr 16, 2016
@jdm
Copy link
Member Author

jdm commented Apr 16, 2016

@bors-servo: r= KiChjang

@bors-servo
Copy link
Contributor

📌 Commit d09a497 has been approved by ``

@highfive highfive added S-awaiting-merge The PR is in the process of compiling and running tests on the automated CI. and removed S-awaiting-review There is new code that needs to be reviewed. labels Apr 16, 2016
@frewsxcv
Copy link
Contributor

@bors-servo: r=KiChjang

@bors-servo
Copy link
Contributor

📌 Commit d09a497 has been approved by KiChjang

@bors-servo
Copy link
Contributor

⌛ Testing commit d09a497 with merge cc290c6...

bors-servo pushed a commit that referenced this pull request Apr 16, 2016
Disable tinyfiledialogs on non-OS X and Linux platforms.

I haven't been able to fix the appveyor build yet, so this gives us back a usable Windows build.

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="35" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/10650)
<!-- Reviewable:end -->
@bors-servo
Copy link
Contributor

☀️ Test successful - android, arm32, arm64, linux-dev, linux-rel, mac-dev-unit, mac-rel-css, mac-rel-wpt

@bors-servo bors-servo merged commit d09a497 into servo:master Apr 16, 2016
@highfive highfive removed the S-awaiting-merge The PR is in the process of compiling and running tests on the automated CI. label Apr 16, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

6 participants