Permalink
Browse files

Auto merge of #22150 - asajeffrey:magicleap-fix-ci-build, r=<try>

[WIP] Fix the magicleap CI build

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

This is a WIP PR to diagnose and fix the magicleap build in CI.

---
<!-- 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 do not require tests because it's fixing the build

<!-- 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/22150)
<!-- Reviewable:end -->
  • Loading branch information...
bors-servo committed Nov 8, 2018
2 parents dd5e5e9 + 22ae71d commit ad7d8b5ce2b6a5432f2efe3ae85736c19c311f88
Showing with 4 additions and 6 deletions.
  1. +1 −1 etc/ci/buildbot_steps.yml
  2. +1 −1 ports/libmlservo/Cargo.toml
  3. +2 −4 python/servo/build_commands.py
@@ -236,7 +236,7 @@ magicleap:
- ./mach clean-nightlies --keep 3 --force
- ./mach clean-cargo-cache --keep 3 --force
- ./etc/ci/clean_build_artifacts.sh
- ./mach build --magicleap --dev
- ./mach build --magicleap --dev -vv # Temporarily -vv to debug the build
- bash ./etc/ci/lockfile_changed.sh
- ./etc/ci/clean_build_artifacts.sh
@@ -13,7 +13,7 @@ test = false
bench = false
[dependencies]
libservo = { path = "../../components/servo" }
libservo = { path = "../../components/servo", features = ["disable-native-bluetooth"] }
log = "0.4"
servo-egl = "0.2"
smallvec = "0.6"
@@ -248,10 +248,8 @@ def build(self, target=None, release=False, dev=False, jobs=None,
if android:
target = self.config["android"]["target"]
if magicleap:
features += ["disable-native-bluetooth"]
if not target:
target = "aarch64-linux-android"
if magicleap and not target:
target = "aarch64-linux-android"
if target:
if self.config["tools"]["use-rustup"]:

0 comments on commit ad7d8b5

Please sign in to comment.