Skip to content

/ servo

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

Webrender update #21223

Merged
merged 1 commit into from Aug 7, 2018
Merged

Webrender update #21223

merged 1 commit into from Aug 7, 2018

Conversation

@paulrouget
Copy link
Contributor

paulrouget commented Jul 21, 2018 •
edited

Requires:

This change is Reviewable
@highfive
Copy link

highfive commented Jul 21, 2018

Heads up! This PR modifies the following files:

  • @asajeffrey: components/constellation/Cargo.toml, components/script/Cargo.toml, components/webdriver_server/Cargo.toml
  • @cbrewster: components/constellation/Cargo.toml
  • @jgraham: components/webdriver_server/Cargo.toml
  • @KiChjang: components/script/Cargo.toml, components/script_traits/Cargo.toml
  • @emilio: components/style/Cargo.toml, components/layout/Cargo.toml, components/style/shared_lock.rs
@highfive
Copy link

highfive commented Jul 21, 2018

warning Warning warning

  • These commits modify unsafe code. Please review it carefully!
@paulrouget paulrouget force-pushed the paulrouget:wrupdate branch from 7ad5c6d to 4348c4e Jul 24, 2018
@paulrouget
Copy link
Contributor Author

paulrouget commented Jul 30, 2018 •
edited

@SimonSapin my changes in shared_lock.rs don't work. I have no idea what needs to be done here. Can you help?
@paulrouget paulrouget force-pushed the paulrouget:wrupdate branch 3 times, most recently from a6f48ff to 853782e Jul 30, 2018
@bors-servo
Copy link
Contributor

bors-servo commented Jul 31, 2018

☔ The latest upstream changes (presumably #21158) made this pull request unmergeable. Please resolve the merge conflicts.
@paulrouget paulrouget force-pushed the paulrouget:wrupdate branch from 853782e to d18cb9c Aug 1, 2018
@bors-servo
Copy link
Contributor

bors-servo commented Aug 1, 2018

☔ The latest upstream changes (presumably #21301) made this pull request unmergeable. Please resolve the merge conflicts.
@paulrouget paulrouget force-pushed the paulrouget:wrupdate branch 2 times, most recently from abb2550 to 9b26baa Aug 6, 2018
@paulrouget
WR update
Loading status checks…
0d9161d
@paulrouget paulrouget force-pushed the paulrouget:wrupdate branch from 9b26baa to 0d9161d Aug 6, 2018
@paulrouget paulrouget changed the title [WIP] Webrender update Webrender update Aug 6, 2018
@paulrouget
Copy link
Contributor Author

paulrouget commented Aug 6, 2018

Everything has landed.

@gw3583 r?
@gw3583
Copy link
Contributor

gw3583 commented Aug 6, 2018

@bors-servo r+
@bors-servo
Copy link
Contributor

bors-servo commented Aug 6, 2018

📌 Commit 0d9161d has been approved by gw3583
@highfive highfive assigned gw3583 and unassigned nox Aug 6, 2018
@bors-servo
Copy link
Contributor

bors-servo commented Aug 6, 2018

⌛ Testing commit 0d9161d with merge 2a0eec4...
bors-servo added a commit that referenced this pull request Aug 6, 2018
@bors-servo
Auto merge of #21223 - paulrouget:wrupdate, r=gw3583
Verified
This commit was created on GitHub.com and signed with a verified signature using GitHub’s key.
GPG key ID: 4AEE18F83AFDEB23 Learn about signing commits
Loading status checks…
2a0eec4 
Webrender update

Requires:

- ~winit PR: rust-windowing/winit#608
- ~glutin PR: rust-windowing/glutin#1047
- ~skia PR: servo/skia#164
- ~azure PR: servo/rust-azure#291
- ~WR PR: servo/webrender#2923
- ~offscreen gl context PR: servo/surfman#127
- ~plane-split PR: servo/plane-split#14
- ~pathfinder: https://github.com/pcwalton/pathfinder/pull/92~

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

bors-servo commented Aug 6, 2018

💔 Test failed - android-x86
@paulrouget
Copy link
Contributor Author

paulrouget commented Aug 6, 2018

@bors-servo retry

  • checking if intermittent or not:
command timed out: 1200 seconds without output running ['env', '--unset', 'ANDROID_NDK', '--unset', 'ANDROID_SDK', './mach', 'test-wpt-android', '--release', '/_mozilla/mozilla/webgl/context_creation_error.html'], attempting to kill
@bors-servo
Copy link
Contributor

bors-servo commented Aug 6, 2018

⚡ Previous build results for android, 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 are reusable. Rebuilding only android-x86...
@bors-servo
Copy link
Contributor

bors-servo commented Aug 6, 2018

💔 Test failed - android-x86
@paulrouget
Copy link
Contributor Author

paulrouget commented Aug 6, 2018

@SimonSapin any idea what's going on here?
@paulrouget
Copy link
Contributor Author

paulrouget commented Aug 6, 2018

@bors-servo retry
@bors-servo
Copy link
Contributor

bors-servo commented Aug 6, 2018

⚡ Previous build results for android, 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 are reusable. Rebuilding only android-x86...
@bors-servo
Copy link
Contributor

bors-servo commented Aug 6, 2018

💔 Test failed - android-x86
@paulrouget
Copy link
Contributor Author

paulrouget commented Aug 7, 2018

Pretty sure the failures are unrelated. I see the same failures in other PR.

#21349
@paulrouget
Copy link
Contributor Author

paulrouget commented Aug 7, 2018

@bors-servo retry
@bors-servo
Copy link
Contributor

bors-servo commented Aug 7, 2018

⚡ Previous build results for android, 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 are reusable. Rebuilding only android-x86...
@bors-servo
Copy link
Contributor

bors-servo commented Aug 7, 2018

☀️ 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: gw3583
Pushing 2a0eec4 to master...
@bors-servo bors-servo merged commit 0d9161d into servo:master Aug 7, 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
This was referenced Aug 7, 2018
Merged
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@gw3583 gw3583

Labels
S-tests-failed
Projects
None yet
Milestone
No milestone
Linked issues

Successfully merging this pull request may close these issues.

None yet

5 participants
@paulrouget @highfive @bors-servo @gw3583 @nox
You can’t perform that action at this time.