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

Put every Android build artefact in target/android/ #22277

Merged
merged 1 commit into from Nov 28, 2018
Merged

Put every Android build artefact in target/android/ #22277

merged 1 commit into from Nov 28, 2018

Conversation

@nox
Copy link
Member

nox commented Nov 27, 2018 •
edited by SimonSapin

This works around #20380 at the cost of rebuilding build-only dependencies twice,
once for normal builds and once for android builds.

This change is Reviewable
@highfive
Copy link

highfive commented Nov 27, 2018

Heads up! This PR modifies the following files:

  • @wafflespeanut: python/servo/command_base.py, python/servo/package_commands.py, python/servo/build_commands.py
@nox
Copy link
Member Author

nox commented Nov 27, 2018

r? @jdm
@highfive highfive assigned jdm and unassigned paulrouget Nov 27, 2018
@nox
Copy link
Member Author

nox commented Nov 27, 2018

@asajeffrey Do you want me to put every ML artifact in target/magicleap?
@asajeffrey
Copy link
Member

asajeffrey commented Nov 27, 2018

@nox sounds good. The places that aren't checked in CI are the ones to do with the nightly upload, in particular

servo/python/servo/package_commands.py

Lines 59 to 61 in c6f4dcc

'magicleap': [
'target/aarch64-linux-android/release/Servo2D.mpk',
],

@nox nox force-pushed the android branch from 054ce02 to 6aaca6d Nov 27, 2018
@nox
Copy link
Member Author

nox commented Nov 27, 2018

@asajeffrey I made a second commit for ML, feel free to look at it again.
@nox nox force-pushed the android branch 3 times, most recently from 2b9f354 to a99480b Nov 27, 2018
@jdm
jdm approved these changes Nov 27, 2018
View changes
@nox
Copy link
Member Author

nox commented Nov 28, 2018

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

bors-servo commented Nov 28, 2018

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

bors-servo commented Nov 28, 2018

⌛ Testing commit a99480b with merge fa02460...
bors-servo added a commit that referenced this pull request Nov 28, 2018
@bors-servo
Auto merge of #22277 - servo:android, 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…
fa02460 
Put every Android build artifact in target/android/

This works around #20380 at the cost of rebuilding build-only dependencies twice,
once for normal builds and once for android builds.

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

bors-servo commented Nov 28, 2018

💔 Test failed - status-taskcluster
@nox nox force-pushed the android branch from a99480b to 1d86d43 Nov 28, 2018
@nox nox changed the title Put every Android build artifact in target/android/ Put every Android build artefact in target/android/ Nov 28, 2018
@nox
Copy link
Member Author

nox commented Nov 28, 2018

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

bors-servo commented Nov 28, 2018

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

bors-servo commented Nov 28, 2018

⌛ Testing commit 1d86d43 with merge eb70e9d...
bors-servo added a commit that referenced this pull request Nov 28, 2018
@bors-servo
Auto merge of #22277 - servo:android, 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…
eb70e9d 
Put every Android build artefact in target/android/

This works around #20380 at the cost of rebuilding build-only dependencies twice,
once for normal builds and once for android builds.

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

bors-servo commented Nov 28, 2018

💔 Test failed - android-x86
@nox
Move Android and ML build artefacts to their own subdirectory
Loading status checks…
496a628 
Works around #20380.
@nox nox force-pushed the android branch from 1d86d43 to 496a628 Nov 28, 2018
@nox
Copy link
Member Author

nox commented Nov 28, 2018

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

bors-servo commented Nov 28, 2018

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

bors-servo commented Nov 28, 2018

⌛ Testing commit 496a628 with merge ae09fe4...
bors-servo added a commit that referenced this pull request Nov 28, 2018
@bors-servo
Auto merge of #22277 - servo:android, 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…
ae09fe4 
Put every Android build artefact in target/android/

This works around #20380 at the cost of rebuilding build-only dependencies twice,
once for normal builds and once for android builds.

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

bors-servo commented Nov 28, 2018

☀️ Test successful - android, android-mac, android-x86, arm32, arm64, linux-dev, linux-rel-css, linux-rel-wpt, mac-dev-unit, mac-rel-css1, mac-rel-css2, mac-rel-wpt1, mac-rel-wpt2, mac-rel-wpt3, mac-rel-wpt4, magicleap, status-taskcluster, windows-msvc-dev
Approved by: jdm
Pushing ae09fe4 to master...
@bors-servo bors-servo merged commit 496a628 into master Nov 28, 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
@SimonSapin SimonSapin deleted the android branch Dec 12, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jdm jdm

Assignees

@jdm jdm

Labels
None yet
Projects
None yet
Milestone
No milestone
Linked issues

Successfully merging this pull request may close these issues.

None yet

6 participants
@nox @highfive @asajeffrey @bors-servo @jdm @paulrouget
You can’t perform that action at this time.