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

Adjust import path for WPT tests to accommodate upstream. #21244

Merged
merged 2 commits into from Jul 25, 2018
Merged

Adjust import path for WPT tests to accommodate upstream. #21244

merged 2 commits into from Jul 25, 2018

Conversation

jdm
Copy link
Member

@jdm jdm commented Jul 24, 2018 •
edited by SimonSapin

This should avoid the ongoing issues where new dependencies are vendored upstream and our setup throws exceptions when some code tries to import them.

This change is Reviewable

@highfive
Copy link

Heads up! This PR modifies the following files:

@highfive highfive added the S-awaiting-review There is new code that needs to be reviewed. label Jul 24, 2018
@jdm
Copy link
Member Author

jdm commented Jul 24, 2018

This should prevent further issues like http://build.servo.org/builders/mac-nightly/builds/769/steps/shell__4/logs/stdio from blocking the nightly sync.

@SimonSapin
Copy link
Member

@bors-servo r+

@bors-servo
Copy link
Contributor

📌 Commit 30f964e has been approved by SimonSapin

@highfive highfive assigned SimonSapin and unassigned Manishearth Jul 25, 2018
@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 Jul 25, 2018
@bors-servo
Copy link
Contributor

⌛ Testing commit 30f964e with merge e676864...

bors-servo pushed a commit that referenced this pull request Jul 25, 2018
Auto merge of #21244 - servo:jdm-patch-23, r=SimonSapin
e676864 
Adjust import path for WPT tests to accommodate upstream.

This should avoid the ongoing issues where new dependencies are vendored upstream and our setup throws exceptions when some code tries to import them.

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

💔 Test failed - mac-rel-wpt3

@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 Jul 25, 2018
@jdm
Copy link
Member Author

jdm commented Jul 25, 2018

@bors-servo retry

@bors-servo
Copy link
Contributor

⚡ Previous build results for android, android-x86, linux-rel-css, linux-rel-wpt, mac-dev-unit, mac-rel-css1, windows-msvc-dev are reusable. Rebuilding only arm32, arm64, linux-dev, mac-rel-css2, mac-rel-wpt1, mac-rel-wpt2, mac-rel-wpt3, mac-rel-wpt4...

@bors-servo
Copy link
Contributor

☀️ Test successful - android, android-x86, arm32, arm64, linux-dev, linux-rel-css, linux-rel-wpt, mac-dev-unit, mac-rel-css1, mac-rel-css2, mac-rel-wpt1, mac-rel-wpt2, mac-rel-wpt3, mac-rel-wpt4, windows-msvc-dev
Approved by: SimonSapin
Pushing e676864 to master...

@bors-servo bors-servo merged commit 30f964e into master Jul 25, 2018
@SimonSapin SimonSapin deleted the jdm-patch-23 branch August 8, 2018 21:13
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@SimonSapin SimonSapin

Labels
S-tests-failed The changes caused existing tests to fail.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
5 participants
@jdm @highfive @SimonSapin @bors-servo @Manishearth