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

Use openjdk-r PPA for OpenJDK8 on Ubuntu 14.04 #629

Merged
merged 1 commit into from Apr 11, 2017

Conversation

@aneeshusa
Copy link
Member

aneeshusa commented Apr 11, 2017

This makes #617 work properly by using the openjdk-r PPA for the OpenJDK 8 packages.
r? @larsbergstrom
cc @fabricedesre


This change is Reviewable

@larsbergstrom
Copy link
Contributor

larsbergstrom commented Apr 11, 2017

I'm testing this locally to ensure that the package is successfully installed (the logs on travis are not typically super verbose).

@aneeshusa
Copy link
Member Author

aneeshusa commented Apr 11, 2017

Yeah, I also believe Travis enables some extra PPAs on their builders which is why #617 passed on Travis even though it isn't working on our builders. I used the servo-linux-cross1 Vagrant VM to test locally.

@larsbergstrom
Copy link
Contributor

larsbergstrom commented Apr 11, 2017

Confirmed this works in a local vagrant provision servo-linux-cross1. Thanks a ton, @aneeshusa!

@bors-servo r+

@bors-servo
Copy link
Contributor

bors-servo commented Apr 11, 2017

📌 Commit 0a0b59e has been approved by larsbergstrom

@bors-servo
Copy link
Contributor

bors-servo commented Apr 11, 2017

Testing commit 0a0b59e with merge c11b664...

bors-servo added a commit that referenced this pull request Apr 11, 2017
…ergstrom

Use openjdk-r PPA for OpenJDK8 on Ubuntu 14.04

This makes #617 work properly by using the openjdk-r PPA for the OpenJDK 8 packages.
r? @larsbergstrom
cc @fabricedesre

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/saltfs/629)
<!-- Reviewable:end -->
@bors-servo
Copy link
Contributor

bors-servo commented Apr 11, 2017

☀️ Test successful - status-travis
Approved by: larsbergstrom
Pushing c11b664 to master...

@bors-servo bors-servo merged commit 0a0b59e into servo:master Apr 11, 2017
1 of 2 checks passed
1 of 2 checks passed
continuous-integration/travis-ci/pr The Travis CI build failed
Details
homu Test successful
Details
bors-servo added a commit that referenced this pull request Apr 18, 2017
Set JAVA_HOME env var to OpenJDK 8 for Android builds

The new gradle builds require Java 8,
and the existing ant builds also work with Java 8.

This is easier than running many `update-alternatives` calls from Salt.
Moreover, this allows keeping Java 7 installed together with Java 8.

Needed for servo/servo#15773.
Follow-up to to #617 and #629.

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/saltfs/638)
<!-- Reviewable:end -->
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

4 participants
You can’t perform that action at this time.