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

Update uuid #22098

Merged
merged 1 commit into from Nov 9, 2018
Merged

Update uuid #22098

merged 1 commit into from Nov 9, 2018

Conversation

@Eijebong
Copy link
Member

Eijebong commented Nov 3, 2018


This change is Reviewable

@highfive
Copy link

highfive commented Nov 3, 2018

Heads up! This PR modifies the following files:

  • @asajeffrey: components/script/dom/node.rs, components/script/Cargo.toml, components/script/dom/baseaudiocontext.rs, components/webdriver_server/Cargo.toml, components/script/dom/url.rs
  • @jgraham: components/webdriver_server/Cargo.toml
  • @KiChjang: components/net/Cargo.toml, components/net/http_loader.rs, components/script/dom/node.rs, components/script/Cargo.toml, components/script/dom/baseaudiocontext.rs and 2 more
@highfive
Copy link

highfive commented Nov 3, 2018

warning Warning warning

  • These commits modify net and script code, but no tests are modified. Please consider adding a test!
@Eijebong Eijebong force-pushed the Eijebong:uuidup branch from ae1f6a9 to 813127d Nov 3, 2018
@Eijebong Eijebong changed the title WIP: Update uuid Update uuid Nov 3, 2018
Cargo.lock Outdated Show resolved Hide resolved
@atouchet
Copy link
Contributor

atouchet commented Nov 3, 2018

ipc-channel 0.11.1 is now published.

@Eijebong Eijebong force-pushed the Eijebong:uuidup branch from 813127d to 05b659a Nov 3, 2018
@jdm
Copy link
Member

jdm commented Nov 5, 2018

@bors-servo
Copy link
Contributor

bors-servo commented Nov 5, 2018

📌 Commit 05b659a has been approved by jdm

bors-servo added a commit that referenced this pull request Nov 5, 2018
Update uuid

<!-- 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/22098)
<!-- Reviewable:end -->
@bors-servo
Copy link
Contributor

bors-servo commented Nov 5, 2018

Testing commit 05b659a with merge 761eae9...

@bors-servo
Copy link
Contributor

bors-servo commented Nov 5, 2018

💔 Test failed - linux-rel-wpt

@Eijebong
Copy link
Member Author

Eijebong commented Nov 5, 2018

│ Failed to start unsandboxed child process!: Os { code: 12, kind: Other, message: "Cannot allocate memory" } (thread Constellation, at libcore/result.rs:1009)

@bors-servo
Copy link
Contributor

bors-servo commented Nov 5, 2018

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

@jdm
Copy link
Member

jdm commented Nov 7, 2018

We can retry this when it's rebased.

@Eijebong
Copy link
Member Author

Eijebong commented Nov 7, 2018

Sure, waiting for the rustc serialize one to land to avoid rebasing twice

@Eijebong Eijebong force-pushed the Eijebong:uuidup branch from 05b659a to 1c8b1de Nov 7, 2018
@Eijebong
Copy link
Member Author

Eijebong commented Nov 7, 2018

Rebased

@jdm
Copy link
Member

jdm commented Nov 7, 2018

@bors-servo
Copy link
Contributor

bors-servo commented Nov 7, 2018

📌 Commit 1c8b1de has been approved by jdm

bors-servo added a commit that referenced this pull request Nov 7, 2018
Update uuid

<!-- 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/22098)
<!-- Reviewable:end -->
@bors-servo
Copy link
Contributor

bors-servo commented Nov 8, 2018

💔 Test failed - mac-rel-css1

@Eijebong
Copy link
Member Author

Eijebong commented Nov 8, 2018

{"status": "FAIL", "group": "default", "message": "assert_equals: expected \"21\" but got \"2\"", "stack": "timeout/<@http://web-platform.test:8000/html/semantics/scripting-1/the-script-element/async_004.htm:19:32\nTest.prototype.step@http://web-platform.test:8000/resources/testharness.js:1568:20\ntimeout@http://web-platform.test:8000/html/semantics/scripting-1/the-script-element/async_004.htm:19:13\n", "subtest": "async script executes as soon as possible after a download is complete", "test": "/html/semantics/scripting-1/the-script-element/async_004.htm", "line": 46212, "action": "test_result", "expected": "PASS"}

@bors-servo
Copy link
Contributor

bors-servo commented Nov 8, 2018

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

@bors-servo
Copy link
Contributor

bors-servo commented Nov 8, 2018

🔒 Merge conflict

@Eijebong Eijebong force-pushed the Eijebong:uuidup branch from 1c8b1de to 36c4208 Nov 9, 2018
@Eijebong
Copy link
Member Author

Eijebong commented Nov 9, 2018

Rebased

@jdm
Copy link
Member

jdm commented Nov 9, 2018

@bors-servo
Copy link
Contributor

bors-servo commented Nov 9, 2018

📌 Commit 36c4208 has been approved by jdm

@bors-servo
Copy link
Contributor

bors-servo commented Nov 9, 2018

Testing commit 36c4208 with merge ed0e6e1...

bors-servo added a commit that referenced this pull request Nov 9, 2018
Update uuid

<!-- 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/22098)
<!-- Reviewable:end -->
@bors-servo
Copy link
Contributor

bors-servo commented Nov 9, 2018

💔 Test failed - linux-rel-wpt

@Eijebong
Copy link
Member Author

Eijebong commented Nov 9, 2018

{"status": "FAIL", "group": "default", "message": "/css/CSS2/fonts/font-148.xht 49ebf872ef928daadc64184878066c1783e136c5\n/css/CSS2/fonts/font-148-ref.xht 4e6ec2a4e7504e5c4bb739eb4fad793251d3180f\nTesting 49ebf872ef928daadc64184878066c1783e136c5 == 4e6ec2a4e7504e5c4bb739eb4fad793251d3180f", "stack": null, "subtest": null, "test": "/css/CSS2/fonts/font-148.xht", "line": 5121, "action": "test_result", "expected": "PASS"}

@jdm
Copy link
Member

jdm commented Nov 9, 2018

@bors-servo
Copy link
Contributor

bors-servo commented Nov 9, 2018

@bors-servo bors-servo merged commit 36c4208 into servo:master Nov 9, 2018
3 checks passed
3 checks passed
continuous-integration/appveyor/pr AppVeyor build succeeded
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
homu Test successful
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

5 participants
You can’t perform that action at this time.