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

Update mozjs_sys to include cross-compilation fixes. #21071

Merged
merged 1 commit into from Jun 20, 2018
Merged

Update mozjs_sys to include cross-compilation fixes. #21071

merged 1 commit into from Jun 20, 2018

Conversation

@jdm
Copy link
Member

jdm commented Jun 19, 2018 •
edited by SimonSapin

  • ./mach build -d does not report any errors
  • ./mach test-tidy does not report any errors
  • These changes fix #20958

This change is Reviewable
@jdm
Update mozjs_sys to include cross-compilation fixes.
Loading status checks…
2544db1
@highfive
Copy link

highfive commented Jun 19, 2018

Heads up! This PR modifies the following files:
@jdm jdm assigned asajeffrey and unassigned pcwalton Jun 19, 2018
@jdm
Copy link
Member Author

jdm commented Jun 19, 2018

cc @paulrouget
@jdm jdm added this to In progress in Android MVP Jun 19, 2018
@asajeffrey
asajeffrey approved these changes Jun 19, 2018
View changes
Copy link
Member

asajeffrey left a comment

Changing Cargo.lock without Cargo.toml is a bit odd. Otherwise LGTM.
@jdm
Copy link
Member Author

jdm commented Jun 19, 2018

That's caused by the package being a minor version bump of a dependency of mozjs.

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

bors-servo commented Jun 19, 2018

📌 Commit 2544db1 has been approved by ajeffrey
@bors-servo
Copy link
Contributor

bors-servo commented Jun 20, 2018

⌛ Testing commit 2544db1 with merge 132bf17...
bors-servo added a commit that referenced this pull request Jun 20, 2018
@bors-servo
Auto merge of #21071 - jdm:mozjs-android, r=ajeffrey
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…
132bf17 
Update mozjs_sys to include cross-compilation fixes.

- [x] `./mach build -d` does not report any errors
- [x] `./mach test-tidy` does not report any errors
- [x] These changes fix #20958

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

bors-servo commented Jun 20, 2018

💔 Test failed - mac-rel-wpt1
@jdm
Copy link
Member Author

jdm commented Jun 20, 2018

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

bors-servo commented Jun 20, 2018

⚡ Previous build results for android, arm32, arm64, linux-dev, linux-rel-css, linux-rel-wpt, mac-dev-unit, mac-rel-css1, mac-rel-css2, mac-rel-wpt2, mac-rel-wpt3, mac-rel-wpt4, windows-msvc-dev are reusable. Rebuilding only mac-rel-wpt1...
@bors-servo
Copy link
Contributor

bors-servo commented Jun 20, 2018

☀️ Test successful - android, 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, windows-msvc-dev
Approved by: ajeffrey
Pushing 132bf17 to master...
@bors-servo bors-servo merged commit 2544db1 into servo:master Jun 20, 2018
3 of 4 checks passed
3 of 4 checks passed
Taskcluster (pull_request) TaskGroup: Exception
Details
continuous-integration/appveyor/pr AppVeyor build succeeded
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
homu Test successful
Details
Android MVP automation moved this from In progress to Done Jun 20, 2018
@bors-servo bors-servo mentioned this pull request Jun 20, 2018
Merged
4 of 4 tasks complete
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@asajeffrey asajeffrey

Assignees

@asajeffrey asajeffrey

Labels
S-tests-failed
Projects
Android MVP
  
Done
Milestone
No milestone
Linked issues

Successfully merging this pull request may close these issues.

Can't compile since mozjs update (Android).
5 participants
@jdm @highfive @bors-servo @asajeffrey @pcwalton
You can’t perform that action at this time.