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 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

@glennw
Copy link
Member Author

glennw commented Jan 28, 2016

@emilio
Copy link
Member

emilio commented Jan 28, 2016

@bors-servo
Copy link
Contributor

bors-servo commented Jan 28, 2016

📌 Commit 4dc7bc0 has been approved by ecoal95

@bors-servo
Copy link
Contributor

bors-servo commented Jan 29, 2016

Testing commit 4dc7bc0 with merge b3e46ea...

bors-servo added 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

bors-servo commented Jan 29, 2016

💔 Test failed - mac-rel-wpt

@glennw
Copy link
Member Author

glennw commented Jan 29, 2016

@bors-servo retry

(Apparent infrastructure issues)

@bors-servo
Copy link
Contributor

bors-servo commented Jan 29, 2016

Testing commit 4dc7bc0 with merge ed29050...

bors-servo added 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

bors-servo commented Jan 29, 2016

💔 Test failed - mac-rel-css

@glennw
Copy link
Member Author

glennw commented Jan 29, 2016

@bors-servo
Copy link
Contributor

bors-servo commented Jan 29, 2016

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

bors-servo commented Jan 29, 2016

💔 Test failed - mac-rel-css

@bors-servo
Copy link
Contributor

bors-servo commented Jan 29, 2016

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

…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.
@glennw glennw force-pushed the glennw:update-gleam-again branch from 4dc7bc0 to 814b94b 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

bors-servo commented Feb 1, 2016

📌 Commit 814b94b has been approved by ecoal95

@bors-servo
Copy link
Contributor

bors-servo commented Feb 1, 2016

Testing commit 814b94b with merge 6b1a08c...

bors-servo added 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

bors-servo commented Feb 1, 2016

💔 Test failed - linux-rel

@emilio
Copy link
Member

emilio commented Feb 1, 2016

@bors-servo
Copy link
Contributor

bors-servo commented Feb 1, 2016

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

bors-servo commented Feb 1, 2016

💔 Test failed - mac-rel-css

@glennw
Copy link
Member Author

glennw commented Feb 1, 2016

@bors-servo
Copy link
Contributor

bors-servo commented Feb 1, 2016

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

bors-servo commented Feb 1, 2016

@bors-servo bors-servo merged commit 814b94b into servo:master Feb 1, 2016
2 checks passed
2 checks passed
continuous-integration/travis-ci/pr The Travis CI build passed
Details
homu Test successful
Details
@glennw glennw deleted the glennw:update-gleam-again branch Dec 12, 2016
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.