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

This updates gleam to a version that relies on OpenGL 3.3 (which is n… #9452

Merged
merged 1 commit into from
Feb 1, 2016

Conversation

glennw
Copy link
Member

@glennw glennw commented Jan 28, 2016

…eeded for the instancing changes in WR - see servo/gleam@fc7e28e).

Hopefully the build machines and everyone using Servo has GL 3.3 available on their machines - if it causes any problems, we can revert this change and investigate further.

Review on Reviewable

@highfive highfive added the S-awaiting-review There is new code that needs to be reviewed. label Jan 28, 2016
@glennw
Copy link
Member Author

glennw commented Jan 28, 2016

r? @ecoal95 or @pcwalton

@emilio
Copy link
Member

emilio commented Jan 28, 2016

@bors-servo: r+

@bors-servo
Copy link
Contributor

📌 Commit 4dc7bc0 has been approved by ecoal95

@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 Jan 28, 2016
@bors-servo
Copy link
Contributor

⌛ Testing commit 4dc7bc0 with merge b3e46ea...

bors-servo pushed a commit that referenced this pull request Jan 29, 2016
This updates gleam to a version that relies on OpenGL 3.3 (which is n…

…eeded for the instancing changes in WR - see servo/gleam@fc7e28e).

Hopefully the build machines and everyone using Servo has GL 3.3 available on their machines - if it causes any problems, we can revert this change and investigate further.

<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.svg" height="40" alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/9452)
<!-- Reviewable:end -->
@bors-servo
Copy link
Contributor

💔 Test failed - mac-rel-wpt

@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 Jan 29, 2016
@glennw
Copy link
Member Author

glennw commented Jan 29, 2016

@bors-servo retry

(Apparent infrastructure issues)

@bors-servo
Copy link
Contributor

⌛ Testing commit 4dc7bc0 with merge ed29050...

bors-servo pushed a commit that referenced this pull request Jan 29, 2016
This updates gleam to a version that relies on OpenGL 3.3 (which is n…

…eeded for the instancing changes in WR - see servo/gleam@fc7e28e).

Hopefully the build machines and everyone using Servo has GL 3.3 available on their machines - if it causes any problems, we can revert this change and investigate further.

<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.svg" height="40" alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/9452)
<!-- Reviewable:end -->
@highfive highfive added S-awaiting-merge The PR is in the process of compiling and running tests on the automated CI. and removed S-tests-failed The changes caused existing tests to fail. labels Jan 29, 2016
@bors-servo
Copy link
Contributor

💔 Test failed - mac-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 Jan 29, 2016
@glennw
Copy link
Member Author

glennw commented Jan 29, 2016

@bors-servo retry

#9163

@bors-servo
Copy link
Contributor

⚡ Previous build results for android, gonk, mac-dev-unit, mac-rel-wpt are reusable. Rebuilding only linux-dev, linux-rel, mac-rel-css...

@bors-servo
Copy link
Contributor

💔 Test failed - mac-rel-css

@highfive highfive added the S-tests-failed The changes caused existing tests to fail. label Jan 29, 2016
@bors-servo
Copy link
Contributor

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

@highfive highfive added the S-needs-rebase There are merge conflict errors. label Jan 29, 2016
…eeded for the instancing changes in WR - see servo/gleam@fc7e28e).

Hopefully the build machines and everyone using Servo has GL 3.3 available on their machines - if it causes any problems, we can revert this change and investigate further.
@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 Jan 31, 2016
@glennw
Copy link
Member Author

glennw commented Jan 31, 2016

Rebased.

@emilio
Copy link
Member

emilio commented Feb 1, 2016

@bors-servo: r+ (crosses fingers)

@bors-servo
Copy link
Contributor

📌 Commit 814b94b has been approved by ecoal95

@highfive highfive removed the S-awaiting-review There is new code that needs to be reviewed. label Feb 1, 2016
@bors-servo
Copy link
Contributor

⌛ Testing commit 814b94b with merge 6b1a08c...

@highfive highfive added S-awaiting-merge The PR is in the process of compiling and running tests on the automated CI. and removed S-needs-rebase There are merge conflict errors. labels Feb 1, 2016
bors-servo pushed a commit that referenced this pull request Feb 1, 2016
This updates gleam to a version that relies on OpenGL 3.3 (which is n…

…eeded for the instancing changes in WR - see servo/gleam@fc7e28e).

Hopefully the build machines and everyone using Servo has GL 3.3 available on their machines - if it causes any problems, we can revert this change and investigate further.

<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.svg" height="40" alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/9452)
<!-- Reviewable:end -->
@bors-servo
Copy link
Contributor

💔 Test failed - linux-rel

@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 Feb 1, 2016
@emilio
Copy link
Member

emilio commented Feb 1, 2016

@bors-servo
Copy link
Contributor

⚡ Previous build results for android, gonk, mac-dev-unit are reusable. Rebuilding only linux-dev, linux-rel, mac-rel-css, mac-rel-wpt...

@bors-servo
Copy link
Contributor

💔 Test failed - mac-rel-css

@highfive highfive added the S-tests-failed The changes caused existing tests to fail. label Feb 1, 2016
@glennw
Copy link
Member Author

glennw commented Feb 1, 2016

@bors-servo
Copy link
Contributor

⚡ Previous build results for android, gonk, linux-dev, mac-dev-unit, mac-rel-wpt are reusable. Rebuilding only linux-rel, mac-rel-css...

@bors-servo
Copy link
Contributor

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

@bors-servo bors-servo merged commit 814b94b into servo:master Feb 1, 2016
@glennw glennw deleted the update-gleam-again branch December 12, 2016 20:46
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-tests-failed The changes caused existing tests to fail.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants