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

Implement EXT_blend_minmax #21080

Merged
merged 1 commit into from Jun 22, 2018
Merged

Implement EXT_blend_minmax #21080

merged 1 commit into from Jun 22, 2018

Conversation

nox
Copy link
Contributor

@nox nox commented Jun 22, 2018 •
edited by SimonSapin

This change is Reviewable

@highfive
Copy link

Heads up! This PR modifies the following files:

  • @asajeffrey: components/script/dom/webidls/EXTBlendMinmax.webidl, components/script/dom/webgl_extensions/extensions.rs, components/script/dom/webgl_extensions/ext/mod.rs, components/script/dom/webgl_extensions/ext/extblendminmax.rs, components/script/dom/webglrenderingcontext.rs
  • @KiChjang: components/script/dom/webidls/EXTBlendMinmax.webidl, components/script/dom/webgl_extensions/extensions.rs, components/script/dom/webgl_extensions/ext/mod.rs, components/script/dom/webgl_extensions/ext/extblendminmax.rs, components/script/dom/webglrenderingcontext.rs

@highfive highfive added the S-awaiting-review There is new code that needs to be reviewed. label Jun 22, 2018
@nox
Copy link
Contributor Author

nox commented Jun 22, 2018

@bors-servo r=emilio

@bors-servo
Copy link
Contributor

📌 Commit cf7e36a has been approved by emilio

@highfive highfive assigned emilio and unassigned asajeffrey Jun 22, 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 Jun 22, 2018
@bors-servo
Copy link
Contributor

⌛ Testing commit cf7e36a with merge 118c2c5...

bors-servo pushed a commit that referenced this pull request Jun 22, 2018
Auto merge of #21080 - servo:webgl, r=emilio
118c2c5 
Implement EXT_blend_minmax

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

💔 Test failed - linux-rel-css

@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 Jun 22, 2018
@nox
Copy link
Contributor Author

nox commented Jun 22, 2018

@bors-servo retry #21082

@bors-servo
Copy link
Contributor

🔒 Merge conflict

@bors-servo
Copy link
Contributor

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

@highfive highfive added the S-needs-rebase There are merge conflict errors. label Jun 22, 2018
@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 Jun 22, 2018
@nox
Copy link
Contributor Author

nox commented Jun 22, 2018

@bors-servo r=emilio

@bors-servo
Copy link
Contributor

📌 Commit 02b8766 has been approved by emilio

@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. S-needs-rebase There are merge conflict errors. labels Jun 22, 2018
@bors-servo
Copy link
Contributor

⌛ Testing commit 02b8766 with merge 728ebcc...

bors-servo pushed a commit that referenced this pull request Jun 22, 2018
Auto merge of #21080 - servo:webgl, r=emilio
728ebcc 
Implement EXT_blend_minmax

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

💔 Test failed - mac-rel-wpt1

@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 Jun 22, 2018
@nox
Copy link
Contributor Author

nox commented Jun 22, 2018

@bors-servo retry #20734

@bors-servo
Copy link
Contributor

⚡ 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-wpt2, mac-rel-wpt3, mac-rel-wpt4, windows-msvc-dev are reusable. Rebuilding only mac-rel-wpt1...

@bors-servo
Copy link
Contributor

☀️ Test successful - 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
Approved by: emilio
Pushing 728ebcc to master...

@bors-servo bors-servo merged commit 02b8766 into master Jun 22, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@emilio emilio emilio approved these changes

Assignees

@emilio emilio

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
@nox @highfive @bors-servo @emilio @asajeffrey