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

Fix magicleap debugmozjs #23318

Merged
merged 4 commits into from May 8, 2019
Merged

Fix magicleap debugmozjs #23318

merged 4 commits into from May 8, 2019
+11 −11

Conversation

@asajeffrey
Copy link
Member

asajeffrey commented May 3, 2019 •
edited by atouchet

These changes get magicleap servo to compile with --debugmozjs.

  • ./mach build -d does not report any errors
  • ./mach test-tidy does not report any errors
  • These changes fix #23074 and fix #22069
  • These changes do not require tests because we're not building debugmozjs servo for magicleap

This change is Reviewable
@highfive
Copy link

highfive commented May 3, 2019

Heads up! This PR modifies the following files:
@highfive
Copy link

highfive commented May 3, 2019

warning Warning warning

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

asajeffrey commented May 3, 2019

Shouldn't merge until servo/mozjs#180 does.
@asajeffrey
Copy link
Member Author

asajeffrey commented May 3, 2019

This build relies on bintools 2.26, so needs an update to the magicleap SDK.
@asajeffrey asajeffrey force-pushed the asajeffrey:magicleap-debugmozjs branch 2 times, most recently from 7f1aea1 to ad892fa May 4, 2019
@asajeffrey asajeffrey changed the title [WIP] Fix magicleap debugmozjs Fix magicleap debugmozjs May 4, 2019
@asajeffrey
Copy link
Member Author

asajeffrey commented May 4, 2019

Rebased. This PR is now ready for review. r? @jdm
@highfive highfive assigned jdm and unassigned SimonSapin May 4, 2019
@jdm
Copy link
Member

jdm commented May 4, 2019

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

bors-servo commented May 4, 2019

📌 Commit ad892fa has been approved by jdm
@bors-servo
Copy link
Contributor

bors-servo commented May 4, 2019

⌛ Testing commit ad892fa with merge fdbab41...
bors-servo added a commit that referenced this pull request May 4, 2019
@bors-servo
Auto merge of #23318 - asajeffrey:magicleap-debugmozjs, r=jdm
Verified
This commit was created on GitHub.com and signed with a verified signature using GitHub’s key.
GPG key ID: 4AEE18F83AFDEB23 Learn about signing commits
Loading status checks…
fdbab41 
Fix magicleap debugmozjs

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

These changes get magicleap servo to compile with `--debugmozjs`.

---
<!-- 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 fix #23074 and #22069
- [X] These changes do not require tests because we're not building debugmozjs servo for magicleap

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

bors-servo commented May 4, 2019

💔 Test failed - magicleap
@CYBAI
Copy link
Collaborator

CYBAI commented May 4, 2019 

Traceback (most recent call last):
  File "/usr/local/lib/python2.7/dist-packages/twisted/internet/defer.py", line 1445, in unwindGenerator
    return _inlineCallbacks(None, gen, Deferred())
  File "/usr/local/lib/python2.7/dist-packages/twisted/internet/defer.py", line 1299, in _inlineCallbacks
    result = g.send(result)
  File "/usr/local/lib/python2.7/dist-packages/buildbot/process/buildstep.py", line 322, in startStep
    result = yield self.run()
  File "/usr/local/lib/python2.7/dist-packages/twisted/internet/defer.py", line 1445, in unwindGenerator
    return _inlineCallbacks(None, gen, Deferred())
--- <exception caught here> ---
  File "/usr/local/lib/python2.7/dist-packages/twisted/internet/defer.py", line 1299, in _inlineCallbacks
    result = g.send(result)
  File "/home/servo/buildbot/master/factories.py", line 39, in run
    got_rev, rev
exceptions.Exception: Actual commit (6af0f4deee8eefecae4065f0f495d93cc3f3ad06) differs from requested commit (fdbab412ef79f90390ee67a1db3f613be8a54ad0)
@jdm
Copy link
Member

jdm commented May 4, 2019

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

bors-servo commented May 4, 2019

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

  • This pull request previously failed. You should add more commits to fix the bug, or use retry to trigger a build again.
  • There's another pull request that is currently being tested, blocking this pull request: #23163
@bors-servo
Copy link
Contributor

bors-servo commented May 4, 2019

📌 Commit ad892fa has been approved by jdm
@bors-servo
Copy link
Contributor

bors-servo commented May 4, 2019

⚡ Previous build results for android-mac, arm32, arm64, linux-rel-wpt, mac-rel-css1, mac-rel-css2, mac-rel-wpt1, mac-rel-wpt2, mac-rel-wpt3, mac-rel-wpt4, status-taskcluster are reusable. Rebuilding only linux-rel-css, magicleap...
bors-servo added a commit that referenced this pull request May 8, 2019
@bors-servo
Auto merge of #23318 - asajeffrey:magicleap-debugmozjs, r=jdm
Verified
This commit was created on GitHub.com and signed with a verified signature using GitHub’s key.
GPG key ID: 4AEE18F83AFDEB23 Learn about signing commits
Loading status checks…
59bfa66 
Fix magicleap debugmozjs

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

These changes get magicleap servo to compile with `--debugmozjs`.

---
<!-- 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 fix #23074 and fix #22069
- [X] These changes do not require tests because we're not building debugmozjs servo for magicleap

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

bors-servo commented May 8, 2019

💔 Test failed - magicleap
@jdm
Copy link
Member

jdm commented May 8, 2019 

mabu: error: /Users/servo/buildbot/slave/magicleap/build/support/magicleap/Servo2D/Servo2D.mabu:33: redefining setting 'CXXFLAGS'
mabu: error: one or more project(s) failed to load

Interesting?
asajeffrey added 2 commits May 3, 2019
@asajeffrey
Get Servo2D to build with debugmozjs
2f47f49
@asajeffrey
Updated mozjs_sys
Loading status checks…
a540807
@asajeffrey asajeffrey force-pushed the asajeffrey:magicleap-debugmozjs branch from 4b15d69 to a540807 May 8, 2019
@asajeffrey
Copy link
Member Author

asajeffrey commented May 8, 2019

Sigh, rebasing sometimes doesn't do the right thing, #23267 got fixed twice.

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

bors-servo commented May 8, 2019

📌 Commit a540807 has been approved by jdm
bors-servo added a commit that referenced this pull request May 8, 2019
@bors-servo
Auto merge of #23318 - asajeffrey:magicleap-debugmozjs, r=jdm
Verified
This commit was created on GitHub.com and signed with a verified signature using GitHub’s key.
GPG key ID: 4AEE18F83AFDEB23 Learn about signing commits
Loading status checks…
3172419 
Fix magicleap debugmozjs

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

These changes get magicleap servo to compile with `--debugmozjs`.

---
<!-- 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 fix #23074 and fix #22069
- [X] These changes do not require tests because we're not building debugmozjs servo for magicleap

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

bors-servo commented May 8, 2019

⌛ Testing commit a540807 with merge 3172419...
@bors-servo
Copy link
Contributor

bors-servo commented May 8, 2019

💔 Test failed - linux-rel-wpt
@jdm
Copy link
Member

jdm commented May 8, 2019

@bors-servo retry
@bors-servo
Copy link
Contributor

bors-servo commented May 8, 2019

⌛ Testing commit a540807 with merge c3a79e8...
bors-servo added a commit that referenced this pull request May 8, 2019
@bors-servo
Auto merge of #23318 - asajeffrey:magicleap-debugmozjs, r=jdm
Verified
This commit was created on GitHub.com and signed with a verified signature using GitHub’s key.
GPG key ID: 4AEE18F83AFDEB23 Learn about signing commits
Loading status checks…
c3a79e8 
Fix magicleap debugmozjs

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

These changes get magicleap servo to compile with `--debugmozjs`.

---
<!-- 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 fix #23074 and fix #22069
- [X] These changes do not require tests because we're not building debugmozjs servo for magicleap

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

bors-servo commented May 8, 2019

☀️ Test successful - android-mac, arm32, arm64, linux-rel-css, linux-rel-wpt, mac-rel-css1, mac-rel-css2, mac-rel-wpt1, mac-rel-wpt2, mac-rel-wpt3, mac-rel-wpt4, magicleap, status-taskcluster
Approved by: jdm
Pushing c3a79e8 to master...
@bors-servo bors-servo merged commit a540807 into servo:master May 8, 2019
4 checks passed
4 checks passed
Taskcluster (pull_request) TaskGroup: success
Details
Travis CI - Pull Request Build Passed
Details
continuous-integration/appveyor/pr AppVeyor build succeeded
Details
homu Test successful
Details
@bors-servo bors-servo mentioned this pull request May 8, 2019
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@jdm jdm

Labels
A-build P-magic leap
Projects
None yet
Milestone
No milestone
Linked issues

Successfully merging this pull request may close these issues.

debugmozjs build is broken
Link errors building debugmozjs magicleap
6 participants
@asajeffrey @highfive @jdm @bors-servo @CYBAI @SimonSapin
You can’t perform that action at this time.