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 harfbuzz-sys #16905

Merged
merged 1 commit into from May 21, 2017
Merged

Update harfbuzz-sys #16905

merged 1 commit into from May 21, 2017

Conversation

@MortimerGoro
Copy link
Contributor

MortimerGoro commented May 17, 2017

See https://github.com/servo/rust-harfbuzz/pull/71/files. Required for #11921


  • ./mach build -d does not report any errors
  • ./mach test-tidy does not report any errors
  • These changes fix #__ (github issue number if applicable).
  • There are tests for these changes OR
  • These changes do not require tests because _____

This change is Reviewable

@nox
Copy link
Member

nox commented May 17, 2017

@bors-servo
Copy link
Contributor

bors-servo commented May 17, 2017

📌 Commit ef2958c has been approved by nox

@bors-servo
Copy link
Contributor

bors-servo commented May 19, 2017

The latest upstream changes (presumably #16893) made this pull request unmergeable. Please resolve the merge conflicts.

@bors-servo
Copy link
Contributor

bors-servo commented May 19, 2017

🔒 Merge conflict

@MortimerGoro MortimerGoro force-pushed the MortimerGoro:update_harfbuzz branch from ef2958c to 20b18f5 May 19, 2017
@MortimerGoro
Copy link
Contributor Author

MortimerGoro commented May 19, 2017

Fixed conflict

@jdm
Copy link
Member

jdm commented May 19, 2017

@bors-servo
Copy link
Contributor

bors-servo commented May 19, 2017

📌 Commit 20b18f5 has been approved by jdm

@highfive highfive assigned jdm and unassigned nox May 19, 2017
@bors-servo
Copy link
Contributor

bors-servo commented May 19, 2017

Testing commit 20b18f5 with merge 7654d6d...

bors-servo added a commit that referenced this pull request May 19, 2017
Update harfbuzz-sys

<!-- Please describe your changes on the following line: -->

See https://github.com/servo/rust-harfbuzz/pull/71/files. Required for #11921

---
<!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `__` with appropriate data: -->
- [x] `./mach build -d` does not report any errors
- [x] `./mach test-tidy` does not report any errors
- [ ] These changes fix #__ (github issue number if applicable).

<!-- Either: -->
- [x] There are tests for these changes OR
- [ ] These changes do not require tests because _____

<!-- Also, please make sure that "Allow edits from maintainers" checkbox is checked, so that we can help you if you get stuck somewhere along the way.-->

<!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. -->

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

bors-servo commented May 19, 2017

💔 Test failed - windows-msvc-dev

@MortimerGoro
Copy link
Contributor Author

MortimerGoro commented May 19, 2017

WIX=C:\Program Files (x86)\WiX Toolset v3.10\
using PTY: False
Downloading harfbuzz-sys v0.1.10
Build FAILED in 0:00:03
error: unable to get packages from source
@jdm
Copy link
Member

jdm commented May 19, 2017

@MortimerGoro
Copy link
Contributor Author

MortimerGoro commented May 21, 2017

Ready for retry, #16953 was merged

@jdm
Copy link
Member

jdm commented May 21, 2017

@bors-servo: retry

@bors-servo
Copy link
Contributor

bors-servo commented May 21, 2017

Testing commit 20b18f5 with merge eabbee6...

bors-servo added a commit that referenced this pull request May 21, 2017
Update harfbuzz-sys

<!-- Please describe your changes on the following line: -->

See https://github.com/servo/rust-harfbuzz/pull/71/files. Required for #11921

---
<!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `__` with appropriate data: -->
- [x] `./mach build -d` does not report any errors
- [x] `./mach test-tidy` does not report any errors
- [ ] These changes fix #__ (github issue number if applicable).

<!-- Either: -->
- [x] There are tests for these changes OR
- [ ] These changes do not require tests because _____

<!-- Also, please make sure that "Allow edits from maintainers" checkbox is checked, so that we can help you if you get stuck somewhere along the way.-->

<!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. -->

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

bors-servo commented May 21, 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-msvc-dev
Approved by: jdm
Pushing eabbee6 to master...

@bors-servo bors-servo merged commit 20b18f5 into servo:master May 21, 2017
2 of 3 checks passed
2 of 3 checks passed
continuous-integration/appveyor/pr AppVeyor build failed
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
homu Test successful
Details
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

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