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

Package both Servo2D and Servo3D in one magicleap mpk #23976

Merged
merged 1 commit into from Aug 16, 2019

Conversation

@asajeffrey
Copy link
Member

asajeffrey commented Aug 15, 2019

Put both magicleap apps in one mpk archive.


  • ./mach build -d does not report any errors
  • ./mach test-tidy does not report any errors
  • These changes do not require tests because we don't test native packaging

This change is Reviewable

@highfive
Copy link

highfive commented Aug 15, 2019

Heads up! This PR modifies the following files:

@asajeffrey
Copy link
Member Author

asajeffrey commented Aug 15, 2019

r? @jdm

@highfive highfive assigned jdm and unassigned avadacatavra Aug 15, 2019
@@ -249,6 +247,7 @@ def package(self, release=False, dev=False, android=None, magicleap=None, debug=
mabu,
"-o", target_dir,
"-t", build_type,
"-r",

This comment has been minimized.

Copy link
@asajeffrey

asajeffrey Aug 15, 2019

Author Member

This fixes #23067.

@jdm
Copy link
Member

jdm commented Aug 15, 2019

@bors-servo
Copy link
Contributor

bors-servo commented Aug 15, 2019

📌 Commit 9a2ba59 has been approved by jdm

@bors-servo
Copy link
Contributor

bors-servo commented Aug 16, 2019

Testing commit 9a2ba59 with merge 6a637ce...

bors-servo added a commit that referenced this pull request Aug 16, 2019
Package both Servo2D and Servo3D in one magicleap mpk

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

Put both magicleap apps in one mpk archive.

---
<!-- 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 we don't test native packaging

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

bors-servo commented Aug 16, 2019

☀️ Test successful - linux-rel-css, linux-rel-wpt, status-taskcluster
Approved by: jdm
Pushing 6a637ce to master...

@bors-servo bors-servo merged commit 9a2ba59 into servo:master Aug 16, 2019
3 checks passed
3 checks passed
Taskcluster (pull_request) TaskGroup: success
Details
continuous-integration/appveyor/pr AppVeyor build succeeded
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.