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 various crates. #14687

Merged
merged 1 commit into from Dec 24, 2016
Merged

Update various crates. #14687

merged 1 commit into from Dec 24, 2016

Conversation

@Ms2ger
Copy link
Contributor

Ms2ger commented Dec 23, 2016 •
edited by SimonSapin

Fixes #14681.

This change is Reviewable
@emilio
Copy link
Member

emilio commented Dec 23, 2016

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

bors-servo commented Dec 23, 2016

📌 Commit 48677b6 has been approved by emilio
@highfive highfive assigned emilio and unassigned pcwalton Dec 23, 2016
@bors-servo
Copy link
Contributor

bors-servo commented Dec 23, 2016

☔ The latest upstream changes (presumably #14684) made this pull request unmergeable. Please resolve the merge conflicts.
@bors-servo
Copy link
Contributor

bors-servo commented Dec 23, 2016

🔒 Merge conflict
@Ms2ger Ms2ger force-pushed the always-be-updating branch from 48677b6 to ed65a53 Dec 23, 2016
@Ms2ger
Copy link
Contributor Author

Ms2ger commented Dec 23, 2016

@bors-servo r=emilio
@bors-servo
Copy link
Contributor

bors-servo commented Dec 23, 2016

📌 Commit ed65a53 has been approved by emilio
@bors-servo
Copy link
Contributor

bors-servo commented Dec 23, 2016

⌛ Testing commit ed65a53 with merge e4f994e...
bors-servo added a commit that referenced this pull request Dec 23, 2016
@bors-servo
Auto merge of #14687 - servo:always-be-updating, r=emilio
Loading status checks…
e4f994e 
Update various crates.

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

bors-servo commented Dec 23, 2016

💔 Test failed - mac-dev-unit
@SimonSapin
Copy link
Member

SimonSapin commented Dec 23, 2016 

  File "/home/servo/buildbot/master/factories.py", line 40, in run
    got_rev, rev
exceptions.Exception: Actual commit (931f7592076404e57f2c2fcefd8bbac404cf967b) differs from requested commit (e4f994eaae6574a1b2ef2c71fb367a7a9c53ca5c)

Infra failure?

@bors-servo retry
@bors-servo
Copy link
Contributor

bors-servo commented Dec 23, 2016

⚡ Previous build results for android, arm32, arm64, linux-dev, linux-rel-css, windows-gnu-dev are reusable. Rebuilding only linux-rel-wpt, mac-dev-unit, mac-rel-css, mac-rel-wpt1, mac-rel-wpt2...
@bors-servo
Copy link
Contributor

bors-servo commented Dec 23, 2016

💔 Test failed - linux-rel-wpt
@Ms2ger
Update various crates.
Loading status checks…
bd67917
@Ms2ger Ms2ger force-pushed the always-be-updating branch from ed65a53 to bd67917 Dec 23, 2016
@Ms2ger
Copy link
Contributor Author

Ms2ger commented Dec 23, 2016

@bors-servo r=emilio

Reverted the rust-url update
@bors-servo
Copy link
Contributor

bors-servo commented Dec 23, 2016

📌 Commit bd67917 has been approved by emilio
@bors-servo
Copy link
Contributor

bors-servo commented Dec 23, 2016

⌛ Testing commit bd67917 with merge 0f49f96...
bors-servo added a commit that referenced this pull request Dec 23, 2016
@bors-servo
Auto merge of #14687 - servo:always-be-updating, r=emilio
Loading status checks…
0f49f96 
Update various crates.

Fixes #14681.
<!-- 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/14687)
<!-- Reviewable:end -->
@bors-servo
Copy link
Contributor

bors-servo commented Dec 23, 2016

💔 Test failed - mac-rel-css
@Ms2ger
Copy link
Contributor Author

Ms2ger commented Dec 23, 2016

@bors-servo retry servo/saltfs#565
@bors-servo
Copy link
Contributor

bors-servo commented Dec 23, 2016

⌛ Testing commit bd67917 with merge efcef86...
@bors-servo
Copy link
Contributor

bors-servo commented Dec 23, 2016

💔 Test failed - mac-dev-unit
@KiChjang
Copy link
Member

KiChjang commented Dec 23, 2016

@bors-servo retry
@bors-servo
Copy link
Contributor

bors-servo commented Dec 24, 2016

⌛ Testing commit bd67917 with merge 29901b1...
bors-servo added a commit that referenced this pull request Dec 24, 2016
@bors-servo
Auto merge of #14687 - servo:always-be-updating, r=emilio
Loading status checks…
29901b1 
Update various crates.

Fixes #14681.
<!-- 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/14687)
<!-- Reviewable:end -->
@bors-servo
Copy link
Contributor

bors-servo commented Dec 24, 2016

☀️ Test successful - android, arm32, arm64, linux-dev, linux-rel-css, linux-rel-wpt, mac-dev-unit, mac-rel-css, mac-rel-wpt1, mac-rel-wpt2, windows-gnu-dev, windows-msvc-dev
@bors-servo bors-servo merged commit bd67917 into master Dec 24, 2016
2 of 4 checks passed
2 of 4 checks passed
continuous-integration/travis-ci/pr The Travis CI build failed
Details
dependency-ci Checking Dependencies
Details
continuous-integration/appveyor/pr AppVeyor build succeeded
Details
homu Test successful
Details
This was referenced Dec 24, 2016
Merged
Merged
Merged
@jdm jdm mentioned this pull request Dec 25, 2016
Closed
@emilio emilio deleted the always-be-updating branch Dec 25, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
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

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