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

Fix the magicleap CI build #22150

Merged
merged 1 commit into from Nov 10, 2018
Merged

Conversation

@asajeffrey
Copy link
Member

asajeffrey commented Nov 8, 2018

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


  • ./mach build -d does not report any errors
  • ./mach test-tidy does not report any errors
  • These changes do not require tests because it's fixing the build

This change is Reviewable

@highfive
Copy link

highfive commented Nov 8, 2018

Heads up! This PR modifies the following files:

@asajeffrey
Copy link
Member Author

asajeffrey commented Nov 8, 2018

@bors-servo try=magicleap

@bors-servo
Copy link
Contributor

bors-servo commented Nov 8, 2018

Trying commit 919ffc0 with merge 1121624...

bors-servo added a commit that referenced this pull request Nov 8, 2018
[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 -->
@bors-servo
Copy link
Contributor

bors-servo commented Nov 8, 2018

💔 Test failed - magicleap

@asajeffrey
Copy link
Member Author

asajeffrey commented Nov 8, 2018

@bors-servo try=magicleap

@bors-servo
Copy link
Contributor

bors-servo commented Nov 8, 2018

Trying commit 22ae71d with merge ad7d8b5...

bors-servo added a commit that referenced this pull request Nov 8, 2018
[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 -->
@asajeffrey
Copy link
Member Author

asajeffrey commented Nov 8, 2018

Landed servo/saltfs#915 which installs makedepend.

@bors-servo try=magicleap

@jdm
Copy link
Member

jdm commented Nov 9, 2018

@bors-servo retry

@bors-servo
Copy link
Contributor

bors-servo commented Nov 9, 2018

Trying commit 22ae71d with merge ff951ec...

bors-servo added a commit that referenced this pull request Nov 9, 2018
[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
- [x] 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 -->
@bors-servo
Copy link
Contributor

bors-servo commented Nov 9, 2018

💔 Test failed - magicleap

@jdm
Copy link
Member

jdm commented Nov 9, 2018

make[1]: /Users/servo/magicleap/v0.17.0/tools/toolchains/bin/aarch64-linux-android-clang: Permission denied

@asajeffrey
Copy link
Member Author

asajeffrey commented Nov 9, 2018

Hmm, that would probably be caused by https://github.com/servo/saltfs/blob/bcc78d578b094e06af93911388e4e0d314adb303/servo-build-dependencies/mac-magicleap.sls#L18

{{ common.servo_home }}/magicleap:
  file.directory:
    - user: servo
    - group: staff
    - dir_mode: 755
    - file_mode: 644
    - makedirs: True
    - recurse:
      - user
      - group
      - mode

the second time this is run, this will remove execute permission from the binaries, sigh.

Could just remove mode from the recursion?

@asajeffrey
Copy link
Member Author

asajeffrey commented Nov 9, 2018

Yay, servo/saltfs#916 and a bit of manual intervention results in:

# ls -l /Users/servo/magicleap/v0.17.0/tools/toolchains/bin/
total 323072
-rwxr-xr-x  1 servo  staff    900828 Sep  6 22:33 aarch64-linux-android-addr2line
-rwxr-xr-x  1 servo  staff    931540 Sep  6 22:33 aarch64-linux-android-ar
-rwxr-xr-x  1 servo  staff   1399084 Sep  6 22:33 aarch64-linux-android-as
-rwxr-xr-x  1 servo  staff    739060 Sep  6 22:33 aarch64-linux-android-c++
-rwxr-xr-x  1 servo  staff    896608 Sep  6 22:33 aarch64-linux-android-c++filt
-rwxr-xr-x  1 servo  staff       188 Sep  6 22:33 aarch64-linux-android-clang
-rwxr-xr-x  1 servo  staff       192 Sep  6 22:33 aarch64-linux-android-clang++
-rwxr-xr-x  1 servo  staff    739060 Sep  6 22:33 aarch64-linux-android-cpp
-rwxr-xr-x  1 servo  staff   4413296 Sep  6 22:33 aarch64-linux-android-dwp
-rwxr-xr-x  1 servo  staff     36152 Sep  6 22:33 aarch64-linux-android-elfedit
-rwxr-xr-x  1 servo  staff    739060 Sep  6 22:33 aarch64-linux-android-g++
-rwxr-xr-x  1 servo  staff    734964 Sep  6 22:33 aarch64-linux-android-gcc
-rwxr-xr-x  1 servo  staff    734964 Sep  6 22:33 aarch64-linux-android-gcc-4.9
-rwxr-xr-x  1 servo  staff    734964 Sep  6 22:33 aarch64-linux-android-gcc-4.9.x
-rwxr-xr-x  1 servo  staff     32312 Sep  6 22:33 aarch64-linux-android-gcc-ar
-rwxr-xr-x  1 servo  staff     32312 Sep  6 22:33 aarch64-linux-android-gcc-nm
-rwxr-xr-x  1 servo  staff     32312 Sep  6 22:33 aarch64-linux-android-gcc-ranlib
-rwxr-xr-x  1 servo  staff    377332 Sep  6 22:33 aarch64-linux-android-gcov
-rwxr-xr-x  1 servo  staff    421508 Sep  6 22:33 aarch64-linux-android-gcov-tool
-rwxr-xr-x  1 servo  staff    968420 Sep  6 22:33 aarch64-linux-android-gprof
-rwxr-xr-x  1 servo  staff   1982456 Sep  6 22:33 aarch64-linux-android-ld
-rwxr-xr-x  1 servo  staff   1982456 Sep  6 22:33 aarch64-linux-android-ld.bfd
-rwxr-xr-x  1 servo  staff   6920628 Sep  6 22:33 aarch64-linux-android-ld.gold
-rwxr-xr-x  1 servo  staff    909040 Sep  6 22:33 aarch64-linux-android-nm
-rwxr-xr-x  1 servo  staff   1083700 Sep  6 22:33 aarch64-linux-android-objcopy
-rwxr-xr-x  1 servo  staff   1530468 Sep  6 22:33 aarch64-linux-android-objdump
-rwxr-xr-x  1 servo  staff    931548 Sep  6 22:33 aarch64-linux-android-ranlib
-rwxr-xr-x  1 servo  staff    448032 Sep  6 22:33 aarch64-linux-android-readelf
-rwxr-xr-x  1 servo  staff    900880 Sep  6 22:33 aarch64-linux-android-size
-rwxr-xr-x  1 servo  staff    900884 Sep  6 22:33 aarch64-linux-android-strings
-rwxr-xr-x  1 servo  staff   1083700 Sep  6 22:33 aarch64-linux-android-strip
-rwxr-xr-x  1 servo  staff  47219428 Sep  6 22:33 clang
-rwxr-xr-x  1 servo  staff  47219428 Sep  6 22:33 clang++
-rwxr-xr-x  1 servo  staff   3978432 Sep  6 22:33 clang-format
-rwxr-xr-x  1 servo  staff  23524124 Sep  6 22:33 clang-tidy
-rwxr-xr-x  1 servo  staff        94 Sep  6 22:33 gdb
-rwxr-xr-x  1 servo  staff   9867224 Sep  6 22:33 gdb-orig

@bors-servo retry

bors-servo added a commit that referenced this pull request Nov 9, 2018
[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
- [x] 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 -->
@bors-servo
Copy link
Contributor

bors-servo commented Nov 9, 2018

Trying commit 22ae71d with merge c1af75c...

@bors-servo
Copy link
Contributor

bors-servo commented Nov 9, 2018

💔 Test failed - magicleap

@asajeffrey
Copy link
Member Author

asajeffrey commented Nov 9, 2018

Hmm, still building blurdroid.

@jdm
Copy link
Member

jdm commented Nov 9, 2018

Yeah, I discovered that when doing a build locally as well with this patch applied.

@highfive highfive removed the S-tests-failed label Nov 9, 2018
@asajeffrey asajeffrey force-pushed the asajeffrey:magicleap-fix-ci-build branch from 32c47b9 to 4752b64 Nov 9, 2018
@bors-servo
Copy link
Contributor

bors-servo commented Nov 9, 2018

☀️ Test successful - magicleap
State: approved= try=True

6 similar comments
@bors-servo
Copy link
Contributor

bors-servo commented Nov 9, 2018

☀️ Test successful - magicleap
State: approved= try=True

@bors-servo
Copy link
Contributor

bors-servo commented Nov 9, 2018

☀️ Test successful - magicleap
State: approved= try=True

@bors-servo
Copy link
Contributor

bors-servo commented Nov 9, 2018

☀️ Test successful - magicleap
State: approved= try=True

@bors-servo
Copy link
Contributor

bors-servo commented Nov 9, 2018

☀️ Test successful - magicleap
State: approved= try=True

@bors-servo
Copy link
Contributor

bors-servo commented Nov 9, 2018

☀️ Test successful - magicleap
State: approved= try=True

@bors-servo
Copy link
Contributor

bors-servo commented Nov 9, 2018

☀️ Test successful - magicleap
State: approved= try=True

@asajeffrey asajeffrey force-pushed the asajeffrey:magicleap-fix-ci-build branch from 4d0e8a5 to 08270f0 Nov 9, 2018
@asajeffrey
Copy link
Member Author

asajeffrey commented Nov 9, 2018

Rebased and updated device crate. @bors-servo r=jdm

@bors-servo
Copy link
Contributor

bors-servo commented Nov 9, 2018

📌 Commit 08270f0 has been approved by jdm

@bors-servo
Copy link
Contributor

bors-servo commented Nov 9, 2018

Testing commit 08270f0 with merge 72a10ff...

bors-servo added a commit that referenced this pull request Nov 9, 2018
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
- [x] 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 -->
@bors-servo
Copy link
Contributor

bors-servo commented Nov 9, 2018

Testing commit 08270f0 with merge fa56fec...

bors-servo added a commit that referenced this pull request Nov 9, 2018
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
- [x] 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 -->
@bors-servo
Copy link
Contributor

bors-servo commented Nov 9, 2018

💔 Test failed - linux-rel-wpt

@asajeffrey
Copy link
Member Author

asajeffrey commented Nov 9, 2018

@bors-servo
Copy link
Contributor

bors-servo commented Nov 9, 2018

@bors-servo
Copy link
Contributor

bors-servo commented Nov 10, 2018

💔 Test failed - linux-rel-wpt

@jdm
Copy link
Member

jdm commented Nov 10, 2018

@bors-servo
Copy link
Contributor

bors-servo commented Nov 10, 2018

@bors-servo bors-servo merged commit 08270f0 into servo:master Nov 10, 2018
3 checks passed
3 checks passed
continuous-integration/appveyor/pr AppVeyor build succeeded
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.