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

Update gecko-media and clap #19402

Merged
merged 2 commits into from Nov 28, 2017
Merged

Update gecko-media and clap #19402

merged 2 commits into from Nov 28, 2017

Conversation

@nox
Copy link
Member

nox commented Nov 28, 2017 •
edited by SimonSapin

This removes moz-cheddar and thus syntex from Servo's dependencies.

This change is Reviewable
@nox
Copy link
Member Author

nox commented Nov 28, 2017

Let's wait for servo/gecko-media#108.
@nox
Copy link
Member Author

nox commented Nov 28, 2017

That gecko-media has unforeseen issues, so let's not block that bump on it.
@SimonSapin
Copy link
Member

SimonSapin commented Nov 28, 2017 

     Running `/home/travis/build/servo/servo/target/debug/build/mp4parse_capi-7403969bf960d20d/build-script-build`

error: failed to run custom build command for `mp4parse_capi v0.9.1`

process didn't exit successfully: `/home/travis/build/servo/servo/target/debug/build/mp4parse_capi-7403969bf960d20d/build-script-build` (exit code: 101)

--- stdout

cargo:rerun-if-changed=src/lib.rs

--- stderr

thread 'main' panicked at 'Could not generate header: "couldn\'t execute `cargo metadata` with manifest \"/home/travis/build/servo/servo/.cargo/registry/src/github.com-1ecc6299db9ec823/mp4parse_capi-0.9.1/Cargo.toml\"."', /checkout/src/libcore/result.rs:906:4
@bors-servo
Copy link
Contributor

bors-servo commented Nov 28, 2017

☔ The latest upstream changes (presumably #19411) made this pull request unmergeable. Please resolve the merge conflicts.
@nox nox force-pushed the bumps branch from 1b624bf to 9fde361 Nov 28, 2017
nox added 2 commits Nov 28, 2017
@nox
Update gecko-media
3463139 
This removes moz-cheddar and thus syntex from Servo's dependencies.
@nox
Update clap to 2.28
Loading status checks…
0848380 
This removes bitflags 0.9.1 from the dependency graph.
@nox nox force-pushed the bumps branch from 9fde361 to 0848380 Nov 28, 2017
@nox
Copy link
Member Author

nox commented Nov 28, 2017

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

bors-servo commented Nov 28, 2017

⌛ Trying commit 0848380 with merge e04ab47...
bors-servo added a commit that referenced this pull request Nov 28, 2017
@bors-servo
Auto merge of #19402 - servo:bumps, r=<try>
Loading status checks…
e04ab47 
Update gecko-media

This removes moz-cheddar and thus syntex from Servo's dependencies.

<!-- 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/19402)
<!-- Reviewable:end -->
@jdm jdm mentioned this pull request Nov 28, 2017
Merged
@bors-servo
Copy link
Contributor

bors-servo commented Nov 28, 2017

☀️ Test successful - android, arm32, arm64, linux-dev, linux-rel-css, linux-rel-wpt, mac-dev-unit, mac-rel-css1, mac-rel-css2, mac-rel-wpt1, mac-rel-wpt2, mac-rel-wpt3, mac-rel-wpt4, windows-msvc-dev
State: approved= try=True
@nox nox changed the title Update gecko-media Update gecko-media and clap Nov 28, 2017
@emilio
emilio approved these changes Nov 28, 2017
View changes
@emilio
Copy link
Member

emilio commented Nov 28, 2017

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

bors-servo commented Nov 28, 2017

📌 Commit 0848380 has been approved by emilio
@highfive highfive assigned emilio and unassigned pcwalton Nov 28, 2017
@bors-servo
Copy link
Contributor

bors-servo commented Nov 28, 2017

⌛ Testing commit 0848380 with merge 077d747...
bors-servo added a commit that referenced this pull request Nov 28, 2017
@bors-servo
Auto merge of #19402 - servo:bumps, r=emilio
Loading status checks…
077d747 
Update gecko-media and clap

This removes moz-cheddar and thus syntex from Servo's dependencies.

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

bors-servo commented Nov 28, 2017

☀️ Test successful - android, arm32, arm64, linux-dev, linux-rel-css, linux-rel-wpt, mac-dev-unit, mac-rel-css1, mac-rel-css2, mac-rel-wpt1, mac-rel-wpt2, mac-rel-wpt3, mac-rel-wpt4, windows-msvc-dev
Approved by: emilio
Pushing 077d747 to master...
@bors-servo bors-servo merged commit 0848380 into master Nov 28, 2017
2 of 4 checks passed
2 of 4 checks passed
continuous-integration/travis-ci/pr The Travis CI build failed
Details
dependency-ci Failed dependency checks
Details
continuous-integration/appveyor/pr AppVeyor build succeeded
Details
homu Test successful
Details
@bors-servo bors-servo mentioned this pull request Nov 28, 2017
Closed
3 of 3 tasks complete
bors-servo added a commit that referenced this pull request Nov 29, 2017
@bors-servo
Auto merge of #19413 - servo:jdm-patch-9, r=avadacatavra
Loading status checks…
462409a 
Don't confuse Cargo when building dependencies.

It's not totally clear why this is experienced intermittently (see #19402), but this allowed mp4parse-capi to actually build on my machine.

<!-- 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/19413)
<!-- Reviewable:end -->
@nox nox deleted the bumps branch Nov 29, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@emilio emilio

Assignees

@emilio emilio

Labels
None yet
Projects
None yet
Milestone
No milestone
Linked issues

Successfully merging this pull request may close these issues.

None yet

6 participants
@nox @SimonSapin @bors-servo @emilio @pcwalton @highfive
You can’t perform that action at this time.