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

Upgrade glutin and related packages #8224

Merged
merged 2 commits into from Oct 27, 2015
Merged

Upgrade glutin and related packages #8224

merged 2 commits into from Oct 27, 2015

Conversation

@mbrubeck
Copy link
Contributor

mbrubeck commented Oct 27, 2015

Updated version of #8172.

Review on Reviewable
@mbrubeck mbrubeck mentioned this pull request Oct 27, 2015
Closed
ports/gonk/Cargo.lock Outdated
@@ -1310,6 +1310,7 @@ dependencies = [
"fnv 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
"html5ever 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)",
"hyper 0.6.15 (registry+https://github.com/rust-lang/crates.io-index)",
"image 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",

This comment has been minimized.

Sign in to view
Copy link
@frewsxcv

frewsxcv Oct 27, 2015

Member

a new version of image was recently pushed (0.4.1) that might be worth including in this so that Google News bug can get closed

This comment has been minimized.

Sign in to view
Copy link
@mbrubeck

mbrubeck Oct 27, 2015

Author Contributor

Updated to image 0.4.1 everywhere.
@mbrubeck mbrubeck force-pushed the mbrubeck:glutinup branch from 1e7aacc to b94c2b9 Oct 27, 2015
@frewsxcv
Copy link
Member

frewsxcv commented Oct 27, 2015

@bors-servo r+
@bors-servo
Copy link
Contributor

bors-servo commented Oct 27, 2015

📌 Commit b94c2b9 has been approved by frewsxcv
@bors-servo
Copy link
Contributor

bors-servo commented Oct 27, 2015

⌛ Testing commit b94c2b9 with merge 16e8095...
bors-servo added a commit that referenced this pull request Oct 27, 2015
@bors-servo
Auto merge of #8224 - mbrubeck:glutinup, r=frewsxcv
16e8095 
Upgrade glutin and related packages

Updated version of #8172.

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

asajeffrey commented Oct 27, 2015

Could we merge this PR after #8214?
@mbrubeck
Copy link
Contributor Author

mbrubeck commented Oct 27, 2015

@bors-servo r=frewsxcv

As discussed with @frewsxcv and @asajeffrey on IRC, I manually cherry-picked the commit from #8214 onto this branch so we can land them together.
@bors-servo
Copy link
Contributor

bors-servo commented Oct 27, 2015

📌 Commit c0dd9bf has been approved by frewsxcv
@bors-servo
Copy link
Contributor

bors-servo commented Oct 27, 2015

⌛ Testing commit c0dd9bf with merge 075cc2b...
bors-servo added a commit that referenced this pull request Oct 27, 2015
@bors-servo
Auto merge of #8224 - mbrubeck:glutinup, r=frewsxcv
075cc2b 
Upgrade glutin and related packages

Updated version of #8172.

<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/8224)
<!-- Reviewable:end -->
@mbrubeck mbrubeck mentioned this pull request Oct 27, 2015
Closed
@bors-servo
Copy link
Contributor

bors-servo commented Oct 27, 2015

💔 Test failed - android
@mbrubeck
Copy link
Contributor Author

mbrubeck commented Oct 27, 2015

Looks like this may need an android-rs-glue upgrade to build on Android.
@mbrubeck mbrubeck force-pushed the mbrubeck:glutinup branch from c0dd9bf to adbb375 Oct 27, 2015
mbrubeck and others added 2 commits Oct 27, 2015
@mbrubeck
Upgrade glutin, image, and related packages
1f8940f
@asajeffrey @mbrubeck
Updated to v0.1.15 of string_cache.
Loading status checks…
219d1b9 
Manually edited ports/gonk/Cargo.lock.
Trying to rebuild ports/gonk/Cargo.lock using cargo-update produes errors:

$ ./mach update-cargo -p string_cache_shared -p string_cache_plugin -p string_cache
components/servo
    Updating registry `https://github.com/rust-lang/crates.io-index`
      Adding bitflags v0.1.1
      Adding gl_generator v0.0.27
      Adding khronos_api v0.0.7
ports/cef
    Updating registry `https://github.com/rust-lang/crates.io-index`
      Adding bitflags v0.3.2
      Adding gl_generator v0.0.27
      Adding khronos_api v0.0.8
ports/gonk
    Updating registry `https://github.com/rust-lang/crates.io-index`
Package `serde v0.5.2` does not have these features: `unstable`
@mbrubeck mbrubeck force-pushed the mbrubeck:glutinup branch from adbb375 to 219d1b9 Oct 27, 2015
@mbrubeck
Copy link
Contributor Author

mbrubeck commented Oct 27, 2015

@bors-servo r=frewsxcv

Bumped android_glue
@bors-servo
Copy link
Contributor

bors-servo commented Oct 27, 2015

📌 Commit 219d1b9 has been approved by frewsxcv
@bors-servo
Copy link
Contributor

bors-servo commented Oct 27, 2015

⌛ Testing commit 219d1b9 with merge 98dc67d...
bors-servo added a commit that referenced this pull request Oct 27, 2015
@bors-servo
Auto merge of #8224 - mbrubeck:glutinup, r=frewsxcv
Loading status checks…
98dc67d 
Upgrade glutin and related packages

Updated version of #8172.

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

bors-servo commented Oct 27, 2015

☀️ Test successful - android, gonk, linux-dev, linux-rel, mac-dev-ref-unit, mac-rel-css, mac-rel-wpt
@bors-servo bors-servo merged commit 219d1b9 into servo:master Oct 27, 2015
2 checks passed
2 checks passed
continuous-integration/travis-ci/pr The Travis CI build passed
Details
homu Test successful
Details
@bors-servo bors-servo mentioned this pull request Oct 27, 2015
Merged
@frewsxcv frewsxcv mentioned this pull request Oct 27, 2015
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@frewsxcv frewsxcv

Labels
S-awaiting-merge
Projects
None yet
Milestone
No milestone
Linked issues

Successfully merging this pull request may close these issues.

None yet

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