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 image. #14929

Merged
merged 1 commit into from Jan 11, 2017
Merged

Update image. #14929

merged 1 commit into from Jan 11, 2017

Conversation

@Ms2ger
Copy link
Contributor

Ms2ger commented Jan 9, 2017 •
edited by larsbergstrom

This change is Reviewable
@highfive
Copy link

highfive commented Jan 9, 2017

Heads up! This PR modifies the following files:

  • @asajeffrey: components/webdriver_server/Cargo.toml
  • @jgraham: components/webdriver_server/Cargo.toml
  • @fitzgen: components/script/Cargo.toml
  • @KiChjang: components/script/Cargo.toml, components/net_traits/Cargo.toml, components/net_traits/Cargo.toml
@highfive
Copy link

highfive commented Jan 9, 2017

warning Warning warning

  • These commits modify script code, but no tests are modified. Please consider adding a test!
@nox
Copy link
Member

nox commented Jan 9, 2017

This needs to be rebased. Will open PR on image to update to byteorder 1.0.0.
@nox
Copy link
Member

nox commented Jan 9, 2017

Oh, @mbrubeck did it already. image-rs/image#605
@nox
Copy link
Member

nox commented Jan 9, 2017

image-rs/image#609
@Ms2ger Ms2ger force-pushed the update-image branch from a5a9fc7 to 8b99c70 Jan 9, 2017
@Ms2ger
Copy link
Contributor Author

Ms2ger commented Jan 9, 2017

Done, please review.
@mbrubeck
Copy link
Contributor

mbrubeck commented Jan 9, 2017

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

bors-servo commented Jan 9, 2017

📌 Commit 8b99c70 has been approved by mbrubeck
@highfive highfive assigned mbrubeck and unassigned KiChjang Jan 9, 2017
@bors-servo
Copy link
Contributor

bors-servo commented Jan 10, 2017

☔ The latest upstream changes (presumably #14818) made this pull request unmergeable. Please resolve the merge conflicts.
@Ms2ger Ms2ger force-pushed the update-image branch from 8b99c70 to b2a049f Jan 10, 2017
@Ms2ger
Copy link
Contributor Author

Ms2ger commented Jan 10, 2017

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

bors-servo commented Jan 10, 2017

📌 Commit b2a049f has been approved by mnrubeck
@Ms2ger
Copy link
Contributor Author

Ms2ger commented Jan 10, 2017

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

bors-servo commented Jan 10, 2017

💡 This pull request was already approved, no need to approve it again.

  • There's another pull request that is currently being tested, blocking this pull request: #14935
@bors-servo
Copy link
Contributor

bors-servo commented Jan 10, 2017

📌 Commit b2a049f has been approved by mbrubeck
@bors-servo
Copy link
Contributor

bors-servo commented Jan 10, 2017

⌛ Testing commit b2a049f with merge 7237e81...
bors-servo added a commit that referenced this pull request Jan 10, 2017
@bors-servo
Auto merge of #14929 - servo:update-image, r=mbrubeck
Loading status checks…
7237e81 
Update image.

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

bors-servo commented Jan 10, 2017

💔 Test failed - linux-rel-wpt
@Ms2ger
Copy link
Contributor Author

Ms2ger commented Jan 10, 2017

@bors-servo retry #14438 #14323
@bors-servo
Copy link
Contributor

bors-servo commented Jan 10, 2017

⌛ Testing commit b2a049f with merge c9d8ce8...
bors-servo added a commit that referenced this pull request Jan 10, 2017
@bors-servo
Auto merge of #14929 - servo:update-image, r=mbrubeck
Loading status checks…
c9d8ce8 
Update image.

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

bors-servo commented Jan 10, 2017

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

Ms2ger commented Jan 11, 2017

Mac seems to be really unhappy about this one.
@Ms2ger @nox
Update image.
Loading status checks…
1c0b09f
@nox nox force-pushed the update-image branch from b2a049f to 1c0b09f Jan 11, 2017
@nox
Copy link
Member

nox commented Jan 11, 2017

Pushed a new image/png/deflate bump.

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

bors-servo commented Jan 11, 2017

📌 Commit 1c0b09f has been approved by mbrubeck
@bors-servo
Copy link
Contributor

bors-servo commented Jan 11, 2017

⌛ Testing commit 1c0b09f with merge 12c71c5...
bors-servo added a commit that referenced this pull request Jan 11, 2017
@bors-servo
Auto merge of #14929 - servo:update-image, r=mbrubeck
Loading status checks…
12c71c5 
Update image.

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

bors-servo commented Jan 11, 2017

☀️ 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 1c0b09f into master Jan 11, 2017
3 of 4 checks passed
3 of 4 checks passed
continuous-integration/travis-ci/pr The Travis CI build failed
Details
continuous-integration/appveyor/pr AppVeyor build succeeded
Details
dependency-ci Dependencies checked
Details
homu Test successful
Details
@Ms2ger Ms2ger deleted the update-image branch Jan 11, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@mbrubeck mbrubeck

Labels
None yet
Projects
None yet
Milestone
No milestone
Linked issues

Successfully merging this pull request may close these issues.

None yet

6 participants
@Ms2ger @highfive @nox @mbrubeck @bors-servo @KiChjang
You can’t perform that action at this time.