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

Re-engage servo-linux-cross1 on Travis #291

Conversation

@aneeshusa
Copy link
Member

aneeshusa commented Apr 3, 2016

Upstream has released new packages for Ubuntu Trusty which resolve
the installation conflicts encountered when installing the ARM g++ packages.

See https://bugs.launchpad.net/ubuntu/+source/gcc-4.8-armhf-cross/+bug/1557205/comments/16
for a comment confirming release of the upstream fix.

This reverts commit aa84355 which was part of #274.

Closes #280.


This change is Reviewable

bors-servo added a commit that referenced this pull request Apr 4, 2016
…strom

Target servo-master\d+ with PCRE in the top file

This fixes the targeting for servo-master\d+ so that the extra states
are actually applied.

I noticed this while reviewing the travis builds for #291.
This was missed in both #284 and #285!

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="35" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/saltfs/292)
<!-- Reviewable:end -->
@larsbergstrom
Copy link
Contributor

larsbergstrom commented Apr 5, 2016

@bors-servo
Copy link
Contributor

bors-servo commented Apr 5, 2016

📌 Commit d32e349 has been approved by larsbergstrom

@bors-servo
Copy link
Contributor

bors-servo commented Apr 5, 2016

🔒 Merge conflict

@bors-servo
Copy link
Contributor

bors-servo commented Apr 5, 2016

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

Upstream has released new packages for Ubuntu Trusty which resolve
the installation conflicts encountered when installing the ARM g++ packages.

See https://bugs.launchpad.net/ubuntu/+source/gcc-4.8-armhf-cross/+bug/1557205/comments/16
for a comment confirming release of the upstream fix.

This reverts commit aa84355.
@aneeshusa aneeshusa force-pushed the aneeshusa:reenable-cross-on-travis-after-fix-for-arm-g++-packages branch from d32e349 to ea28291 Apr 5, 2016
@aneeshusa
Copy link
Member Author

aneeshusa commented Apr 5, 2016

Rebased.

@larsbergstrom
Copy link
Contributor

larsbergstrom commented Apr 5, 2016

@bors-servo
Copy link
Contributor

bors-servo commented Apr 5, 2016

📌 Commit ea28291 has been approved by larsbergstrom

bors-servo added a commit that referenced this pull request Apr 5, 2016
…-arm-g++-packages, r=larsbergstrom

Re-engage servo-linux-cross1 on Travis

Upstream has released new packages for Ubuntu Trusty which resolve
the installation conflicts encountered when installing the ARM g++ packages.

See https://bugs.launchpad.net/ubuntu/+source/gcc-4.8-armhf-cross/+bug/1557205/comments/16
for a comment confirming release of the upstream fix.

This reverts commit aa84355 which was part of #274.

Closes #280.

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="35" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/saltfs/291)
<!-- Reviewable:end -->
@bors-servo
Copy link
Contributor

bors-servo commented Apr 5, 2016

Testing commit ea28291 with merge a20dd5f...

@bors-servo
Copy link
Contributor

bors-servo commented Apr 5, 2016

☀️ Test successful - travis

@bors-servo bors-servo merged commit ea28291 into servo:master Apr 5, 2016
2 checks passed
2 checks passed
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.

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