Skip to content

/ saltfs

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 the jdk version #617

Merged
merged 1 commit into from Mar 13, 2017
Merged

Update the jdk version #617

merged 1 commit into from Mar 13, 2017

Conversation

@fabricedesre
Copy link
Contributor

fabricedesre commented Mar 13, 2017 •
edited by larsbergstrom

This is needed for the gradle based build system (see servo/servo#15773 (comment))

This change is Reviewable
@fabricedesre
Update the jdk version
Loading status checks…
0150d29 
This is needed for the gradle based build system (see servo/servo#15773 (comment))
@highfive
Copy link

highfive commented Mar 13, 2017

Thanks for the pull request, and welcome! The Servo team is excited to review your changes, and you should hear from @aneeshusa (or someone else) soon.
@larsbergstrom
Copy link
Contributor

larsbergstrom commented Mar 13, 2017

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

bors-servo commented Mar 13, 2017

📌 Commit 0150d29 has been approved by larsbergstrom
@highfive highfive assigned larsbergstrom and unassigned aneeshusa Mar 13, 2017
@bors-servo
Copy link
Contributor

bors-servo commented Mar 13, 2017

⌛ Testing commit 0150d29 with merge c8d287a...
bors-servo added a commit that referenced this pull request Mar 13, 2017
@bors-servo
Auto merge of #617 - servo:open-jdk-8, r=larsbergstrom
Loading status checks…
c8d287a 
Update the jdk version

This is needed for the gradle based build system (see servo/servo#15773 (comment))

<!-- 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/617)
<!-- Reviewable:end -->
@edunham
Copy link
Contributor

edunham commented Mar 13, 2017

If this has spent more than an hour or so after landing without being deployed, ping me on IRC and I'll roll it out. I'll try to check back on it through the afternoon.
@bors-servo
Copy link
Contributor

bors-servo commented Mar 13, 2017

☀️ Test successful - status-travis
Approved by: larsbergstrom
Pushing c8d287a to master...
@bors-servo bors-servo merged commit 0150d29 into master Mar 13, 2017
3 checks passed
3 checks passed
continuous-integration/travis-ci/pr The Travis CI build passed
Details
continuous-integration/travis-ci/push The Travis CI build passed
Details
homu Test successful
Details
@edunham
Copy link
Contributor

edunham commented Mar 13, 2017

I just highstated the cross builders. The change should be deployed, unless the Salt gitfs wizardry has failed us.
@larsbergstrom larsbergstrom mentioned this pull request Mar 13, 2017
Merged
4 of 5 tasks complete
@larsbergstrom
Copy link
Contributor

larsbergstrom commented Mar 13, 2017

Ugh, Ubuntu 14.04.5 LTS does not have openjdk-8-jdk, but this did not fail in testing or on deploy. Only when I try to apt-get install on the machine do I get:

E: Unable to locate package openjdk-8-jdk
@larsbergstrom
Copy link
Contributor

larsbergstrom commented Mar 13, 2017

@aneeshusa Does ^ seem familiar to you? Is there something I'm doing wrong that could have caught this?
@KiChjang
Copy link
Member

KiChjang commented Mar 13, 2017

The package name is apparently openjdk-8-jre, according to this http://openjdk.java.net/install/.
@larsbergstrom
Copy link
Contributor

larsbergstrom commented Mar 13, 2017

I think we may need to do more work, given that we're on 14.01 - http://askubuntu.com/a/666481
@MortimerGoro MortimerGoro mentioned this pull request Mar 13, 2017
Merged
bors-servo added a commit that referenced this pull request Apr 11, 2017
@bors-servo
Auto merge of #618 - MortimerGoro:android_tools, r=aneeshusa
Loading status checks…
8ad13d4 
Update android build tools

This is needed for the gradle based build system too. See servo/servo#15773 and #617

<!-- 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/618)
<!-- Reviewable:end -->
@aneeshusa aneeshusa mentioned this pull request Apr 11, 2017
Merged
bors-servo added a commit that referenced this pull request Apr 11, 2017
@bors-servo
Auto merge of #629 - aneeshusa:fix-openjdk-8-on-ubuntu-14.04, r=larsb…
Loading status checks…
c11b664 
…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 -->
@aneeshusa aneeshusa mentioned this pull request Apr 17, 2017
Merged
bors-servo added a commit that referenced this pull request Apr 18, 2017
@bors-servo
Auto merge of #638 - aneeshusa:set-java-home, r=larsbergstrom
Loading status checks…
de820a3 
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 -->
@SimonSapin SimonSapin deleted the open-jdk-8 branch Dec 20, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@larsbergstrom larsbergstrom

Labels
None yet
Projects
None yet
Milestone
No milestone
Linked issues

Successfully merging this pull request may close these issues.

None yet

7 participants
@fabricedesre @highfive @larsbergstrom @bors-servo @edunham @KiChjang @aneeshusa
You can’t perform that action at this time.