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

Fix travis yml #154

Merged
merged 3 commits into from Mar 25, 2020
Merged

Fix travis yml #154

merged 3 commits into from Mar 25, 2020

Conversation

@asajeffrey
Copy link
Member

asajeffrey commented Mar 25, 2020

Gets the travis build to be green again (includes #152 and #153).

asajeffrey added 3 commits Mar 25, 2020
@@ -158,11 +159,11 @@ impl Device {
];

EGL_FUNCTIONS.with(|egl| {
let egl_surface = if let Some(HandleOrTexture::Texture(texture)) = share_handle {
let egl_surface = if let Some(share_handle) = share_handle {

This comment has been minimized.

Copy link
@jdm

jdm Mar 25, 2020

Member

These changes don't look like they compile when used with the opexnr webxr backend.

This comment has been minimized.

Copy link
@jdm

jdm Mar 25, 2020

Member

https://github.com/jdm/surfman/commits/d3d-share is a branch that should address that.

@jdm
Copy link
Member

jdm commented Mar 25, 2020

If the goal is only to get the build working and the openxr changes will be in a separate PR, that's fine.

@asajeffrey
Copy link
Member Author

asajeffrey commented Mar 25, 2020

This is just to get the build working again, atm everything is red on travis, which is suboptimal.

@jdm jdm merged commit 1378091 into servo:master Mar 25, 2020
1 check passed
1 check passed
Travis CI - Pull Request Build Passed
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

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