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

Glutin upgrade investigations #23448

Closed
wants to merge 8 commits into from
Closed

Glutin upgrade investigations #23448

wants to merge 8 commits into from
+652 −330

Conversation

@jdm
Copy link
Member

jdm commented May 23, 2019 •
edited by SimonSapin

This change is Reviewable
jdm added 2 commits May 23, 2019
@jdm
tmp
866bd5e
@jdm
minimize build
Loading status checks…
6df238a
@highfive
Copy link

highfive commented May 23, 2019

Heads up! This PR modifies the following files:

  • @paulrouget: ports/glutin/embedder.rs, ports/glutin/Cargo.toml
@jdm jdm removed the S-awaiting-review label May 23, 2019
@jdm
Copy link
Member Author

jdm commented May 23, 2019

@bors-servo try=android
bors-servo added a commit that referenced this pull request May 23, 2019
@bors-servo
Auto merge of #23448 - jdm:glutin-up-investigate, r=<try>
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…
9394135 
Glutin upgrade investigations

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

bors-servo commented May 23, 2019

⌛ Trying commit 6df238a with merge 9394135...
@jdm
Copy link
Member Author

jdm commented May 23, 2019 •
edited

The changes to upgrade azure and rust-webvr did not cause the build to fail. Next steps:

  • upgrade glutin and parking-lot
  • upgrade gleam and gl-generator
  • upgrade nix and rust-offscreen-rendering-context
@jdm
Copy link
Member Author

jdm commented May 24, 2019

@bors-servo try=android
1 similar comment
@jdm
Copy link
Member Author

jdm commented May 24, 2019

@bors-servo try=android
@jdm
Copy link
Member Author

jdm commented May 24, 2019

@bors-servo retry
@jdm
Copy link
Member Author

jdm commented May 24, 2019

@bors-servo try-
@jdm
Copy link
Member Author

jdm commented May 24, 2019

@bors-servo try=wpt
@jdm
Copy link
Member Author

jdm commented May 24, 2019

@bors-servo try-
@jdm jdm force-pushed the jdm:glutin-up-investigate branch from e50f64d to f858c83 May 24, 2019
@jdm
Copy link
Member Author

jdm commented May 24, 2019

@bors-servo try=android
bors-servo added a commit that referenced this pull request May 24, 2019
@bors-servo
Auto merge of #23448 - jdm:glutin-up-investigate, r=<try>
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…
289d515 
Glutin upgrade investigations

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

bors-servo commented May 24, 2019

⌛ Trying commit f858c83 with merge 289d515...
@bors-servo
Copy link
Contributor

bors-servo commented May 24, 2019

💔 Test failed - status-taskcluster
@jdm
Copy link
Member Author

jdm commented May 24, 2019

Something in parking_lot, glutin, or crossbeam_channel is to blame!
@jdm jdm force-pushed the jdm:glutin-up-investigate branch from f858c83 to e41f641 May 24, 2019
@jdm
Copy link
Member Author

jdm commented May 24, 2019

@bors-servo try=android
@jdm
Copy link
Member Author

jdm commented May 24, 2019

@bors-servo try-
@jdm
Copy link
Member Author

jdm commented May 24, 2019

@bors-servo try=android
@bors-servo
Copy link
Contributor

bors-servo commented May 24, 2019

⌛ Trying commit e41f641 with merge 5e56117...
bors-servo added a commit that referenced this pull request May 24, 2019
@bors-servo
Auto merge of #23448 - jdm:glutin-up-investigate, r=<try>
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…
5e56117 
Glutin upgrade investigations

<!-- 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/23448)
<!-- Reviewable:end -->
@bors-servo bors-servo mentioned this pull request May 24, 2019
Merged
@jdm jdm closed this May 24, 2019
@jdm jdm reopened this May 24, 2019
@jdm
update glutin
Loading status checks…
879f611
@jdm jdm force-pushed the jdm:glutin-up-investigate branch from e41f641 to 879f611 May 25, 2019
@jdm
Copy link
Member Author

jdm commented May 25, 2019

@bors-servo try=android
bors-servo added a commit that referenced this pull request May 25, 2019
@bors-servo
Auto merge of #23448 - jdm:glutin-up-investigate, r=<try>
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…
68d3929 
Glutin upgrade investigations

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

bors-servo commented May 25, 2019

⌛ Trying commit 879f611 with merge 68d3929...
@jdm
Copy link
Member Author

jdm commented May 25, 2019

When I only upgrade glutin and not parking_lot, the android problem does not appear. Fascinating!
jdm and others added 4 commits May 25, 2019
@jdm
update crossbeam-channel
f5395e0
@jdm
upgrade gleam, offscreen_gl_context, nix, gl_generator.
4b0c9cb
@jdm
fix tidy
8379636
@paulrouget @jdm
Glutin update: new Context API
Loading status checks…
05b59db
@jdm
Copy link
Member Author

jdm commented May 25, 2019

@bors-servo try=android
@bors-servo
Copy link
Contributor

bors-servo commented May 25, 2019

⌛ Trying commit 05b59db with merge 3e50940...
bors-servo added a commit that referenced this pull request May 25, 2019
@bors-servo
Auto merge of #23448 - jdm:glutin-up-investigate, r=<try>
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…
3e50940 
Glutin upgrade investigations

<!-- 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/23448)
<!-- Reviewable:end -->
@jdm
Copy link
Member Author

jdm commented May 25, 2019

Including everything from #23288 except for the parking_lot upgrade compiled successfully. I'm going to see if upgrading to 0.8 instead of 0.7 makes any difference.
@jdm
upgrade parking_lot
Loading status checks…
fb9a3aa
@jdm
Copy link
Member Author

jdm commented May 25, 2019

@bors-servo try=android
@bors-servo
Copy link
Contributor

bors-servo commented May 25, 2019

⌛ Trying commit fb9a3aa with merge ff77155...
bors-servo added a commit that referenced this pull request May 25, 2019
@bors-servo
Auto merge of #23448 - jdm:glutin-up-investigate, r=<try>
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…
ff77155 
Glutin upgrade investigations

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

bors-servo commented May 25, 2019

☔ The latest upstream changes (presumably #23449) made this pull request unmergeable. Please resolve the merge conflicts.
@jdm
Copy link
Member Author

jdm commented May 25, 2019

It successfully built with parking_lot 0.8, hooray!
@jdm jdm mentioned this pull request May 25, 2019
Merged
bors-servo added a commit that referenced this pull request May 25, 2019
@bors-servo
Auto merge of #23457 - jdm:glutes, r=jdm
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…
a97eb93 
Glutin 0.21

This is just #23288 taking into account the lessons learned in #23448 so that Android builds successfully.

<!-- 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/23457)
<!-- Reviewable:end -->
@paulrouget
Copy link
Contributor

paulrouget commented May 27, 2019

Fixed by #23457
@paulrouget paulrouget closed this May 27, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
S-awaiting-review S-needs-rebase
Projects
None yet
Milestone
No milestone
Linked issues

Successfully merging this pull request may close these issues.

None yet

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