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

Update dependencies. #7717

Merged
merged 1 commit into from Sep 23, 2015
Merged

Update dependencies. #7717

merged 1 commit into from Sep 23, 2015

Conversation

@Ms2ger
Copy link
Contributor

Ms2ger commented Sep 23, 2015

Review on Reviewable

@metajack
Copy link
Contributor

metajack commented Sep 23, 2015

An explanation for the dupes or removal of the dupes is needed before this should land.


Reviewed 2 of 3 files at r1.
Review status: 2 of 3 files reviewed at latest revision, 5 unresolved discussions, all commit checks successful.


components/servo/Cargo.lock, line 651 [r1] (raw file):
Whoops. This is adding a second copy of gl_generator instead of updating the one we have.


components/servo/Cargo.lock, line 897 [r1] (raw file):
Dupe khronos_api added here.


ports/cef/Cargo.lock, line 602 [r1] (raw file):
dupe


ports/cef/Cargo.lock, line 848 [r1] (raw file):
dupe


ports/cef/Cargo.lock, line 1870 [r1] (raw file):
yay for removing a dupe


Comments from the review on Reviewable.io

@metajack
Copy link
Contributor

metajack commented Sep 23, 2015

Reviewed 1 of 3 files at r1.
Review status: all files reviewed at latest revision, 5 unresolved discussions, all commit checks successful.


Comments from the review on Reviewable.io

@Ms2ger
Copy link
Contributor Author

Ms2ger commented Sep 23, 2015

Review status: all files reviewed at latest revision, 4 unresolved discussions, all commit checks successful.


components/servo/Cargo.lock, line 651 [r1] (raw file):
glutin is apparently very picky about its version of gl_generator.


components/servo/Cargo.lock, line 897 [r1] (raw file):
Ditto


ports/cef/Cargo.lock, line 602 [r1] (raw file):
Ditto


ports/cef/Cargo.lock, line 848 [r1] (raw file):
Ditto


Comments from the review on Reviewable.io

@metajack
Copy link
Contributor

metajack commented Sep 23, 2015

@bors-servo r+


Review status: all files reviewed at latest revision, 4 unresolved discussions, all commit checks successful.


Comments from the review on Reviewable.io

@bors-servo
Copy link
Contributor

bors-servo commented Sep 23, 2015

📌 Commit 6fc66dd has been approved by metajack

@bors-servo
Copy link
Contributor

bors-servo commented Sep 23, 2015

Testing commit 6fc66dd with merge 705ad72...

bors-servo pushed a commit that referenced this pull request Sep 23, 2015
bors-servo
Update dependencies.



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

bors-servo commented Sep 23, 2015

💔 Test failed - mac-rel-wpt

@jdm
Copy link
Member

jdm commented Sep 23, 2015

@bors-servo
Copy link
Contributor

bors-servo commented Sep 23, 2015

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

@bors-servo
Copy link
Contributor

bors-servo commented Sep 23, 2015

@bors-servo bors-servo merged commit 6fc66dd into master Sep 23, 2015
1 check passed
1 check passed
homu Test successful
Details
@frewsxcv frewsxcv deleted the depup branch Oct 9, 2015
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

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