Skip to content

Commit

Permalink
Choose generic versions for Java version in CI (#1514)
Browse files Browse the repository at this point in the history
By choosing a less specific version, we can take advantage of the pre-installed JVMs as part of the Github runner's image, https://github.com/actions/virtual-environments/blob/main/images/linux/Ubuntu2004-README.md#java.

In that vein as well, "AdoptOpenJDK" is now "Adoptium" / "Temurin", and so to take advantage of cache we need to choose that.

JDK 17 should be pre-installed as part of actions/runner-images#4085

See https://blog.adoptopenjdk.net/2021/08/goodbye-adoptopenjdk-hello-adoptium/

Follow up, #1513
  • Loading branch information
devinrsmith authored Nov 1, 2021
1 parent 33a930f commit 2f13538
Show file tree
Hide file tree
Showing 8 changed files with 79 additions and 76 deletions.
40 changes: 20 additions & 20 deletions .github/workflows/build-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,17 +13,17 @@ jobs:

- name: Setup JDK 11
id: setup-java-11
uses: actions/setup-java@v2.2.0
uses: actions/setup-java@v2
with:
distribution: 'zulu'
distribution: 'temurin'
java-version: '11'

- name: Setup JDK 17
id: setup-java-17
uses: actions/setup-java@v2.2.0
uses: actions/setup-java@v2
with:
distribution: 'zulu'
java-version: '17.0.0'
distribution: 'temurin'
java-version: '17'

- name: Set JAVA_HOME
run: echo "JAVA_HOME=${{ steps.setup-java-11.outputs.path }}" >> $GITHUB_ENV
Expand Down Expand Up @@ -99,17 +99,17 @@ jobs:

- name: Setup JDK 11
id: setup-java-11
uses: actions/setup-java@v2.2.0
uses: actions/setup-java@v2
with:
distribution: 'zulu'
distribution: 'temurin'
java-version: '11'

- name: Setup JDK 17
id: setup-java-17
uses: actions/setup-java@v2.2.0
uses: actions/setup-java@v2
with:
distribution: 'zulu'
java-version: '17.0.0'
distribution: 'temurin'
java-version: '17'

- name: Set JAVA_HOME
run: echo "JAVA_HOME=${{ steps.setup-java-11.outputs.path }}" >> $GITHUB_ENV
Expand Down Expand Up @@ -181,17 +181,17 @@ jobs:

- name: Setup JDK 11
id: setup-java-11
uses: actions/setup-java@v2.2.0
uses: actions/setup-java@v2
with:
distribution: 'zulu'
distribution: 'temurin'
java-version: '11'

- name: Setup JDK 17
id: setup-java-17
uses: actions/setup-java@v2.2.0
uses: actions/setup-java@v2
with:
distribution: 'zulu'
java-version: '17.0.0'
distribution: 'temurin'
java-version: '17'

- name: Set JAVA_HOME
run: echo "JAVA_HOME=${{ steps.setup-java-11.outputs.path }}" >> $GITHUB_ENV
Expand Down Expand Up @@ -287,17 +287,17 @@ jobs:
- name: Setup JDK 11
id: setup-java-11
uses: actions/setup-java@v2.2.0
uses: actions/setup-java@v2
with:
distribution: 'zulu'
distribution: 'temurin'
java-version: '11'

- name: Setup JDK 17
id: setup-java-17
uses: actions/setup-java@v2.2.0
uses: actions/setup-java@v2
with:
distribution: 'zulu'
java-version: '17.0.0'
distribution: 'temurin'
java-version: '17'

- name: Set JAVA_HOME
run: echo "JAVA_HOME=${{ steps.setup-java-11.outputs.path }}" >> $GITHUB_ENV
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/check-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,17 +18,17 @@ jobs:

- name: Setup JDK 11
id: setup-java-11
uses: actions/setup-java@v2.2.0
uses: actions/setup-java@v2
with:
distribution: 'zulu'
distribution: 'temurin'
java-version: '11'

- name: Setup JDK 17
id: setup-java-17
uses: actions/setup-java@v2.2.0
uses: actions/setup-java@v2
with:
distribution: 'zulu'
java-version: '17.0.0'
distribution: 'temurin'
java-version: '17'

- name: Set JAVA_HOME
run: echo "JAVA_HOME=${{ steps.setup-java-11.outputs.path }}" >> $GITHUB_ENV
Expand Down
34 changes: 18 additions & 16 deletions .github/workflows/docs-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,24 +15,25 @@ jobs:

- name: Setup JDK 11
id: setup-java-11
uses: actions/setup-java@v2.2.0
uses: actions/setup-java@v2
with:
distribution: 'zulu'
distribution: 'temurin'
java-version: '11'

# TODO(deephaven-core#1513): Remove non-LTS JDK 15 as part of javadocs process
- name: Setup JDK 15
id: setup-java-15
uses: actions/setup-java@v2.2.0
uses: actions/setup-java@v2
with:
distribution: 'zulu'
java-version: '15.0.4'
java-version: '15'

- name: Setup JDK 17
id: setup-java-17
uses: actions/setup-java@v2.2.0
uses: actions/setup-java@v2
with:
distribution: 'zulu'
java-version: '17.0.0'
distribution: 'temurin'
java-version: '17'

- name: Set JAVA_HOME
run: echo "JAVA_HOME=${{ steps.setup-java-11.outputs.path }}" >> $GITHUB_ENV
Expand Down Expand Up @@ -76,24 +77,25 @@ jobs:

- name: Setup JDK 11
id: setup-java-11
uses: actions/setup-java@v2.2.0
uses: actions/setup-java@v2
with:
distribution: 'zulu'
distribution: 'temurin'
java-version: '11'

# TODO(deephaven-core#1513): Remove non-LTS JDK 15 as part of javadocs process
- name: Setup JDK 15
id: setup-java-15
uses: actions/setup-java@v2.2.0
uses: actions/setup-java@v2
with:
distribution: 'zulu'
java-version: '15.0.4'
java-version: '15'

- name: Setup JDK 17
id: setup-java-17
uses: actions/setup-java@v2.2.0
uses: actions/setup-java@v2
with:
distribution: 'zulu'
java-version: '17.0.0'
distribution: 'temurin'
java-version: '17'

- name: Set JAVA_HOME
run: echo "JAVA_HOME=${{ steps.setup-java-11.outputs.path }}" >> $GITHUB_ENV
Expand Down Expand Up @@ -142,9 +144,9 @@ jobs:

- name: Setup JDK 11
id: setup-java-11
uses: actions/setup-java@v2.2.0
uses: actions/setup-java@v2
with:
distribution: 'zulu'
distribution: 'temurin'
java-version: '11'

- name: Set JAVA_HOME
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/long-check-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,17 +15,17 @@ jobs:

- name: Setup JDK 11
id: setup-java-11
uses: actions/setup-java@v2.2.0
uses: actions/setup-java@v2
with:
distribution: 'zulu'
distribution: 'temurin'
java-version: '11'

- name: Setup JDK 17
id: setup-java-17
uses: actions/setup-java@v2.2.0
uses: actions/setup-java@v2
with:
distribution: 'zulu'
java-version: '17.0.0'
distribution: 'temurin'
java-version: '17'

- name: Set JAVA_HOME
run: echo "JAVA_HOME=${{ steps.setup-java-11.outputs.path }}" >> $GITHUB_ENV
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/nightly-benchmarks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,17 +16,17 @@ jobs:

- name: Setup JDK 11
id: setup-java-11
uses: actions/setup-java@v2.2.0
uses: actions/setup-java@v2
with:
distribution: 'zulu'
distribution: 'temurin'
java-version: '11'

- name: Setup JDK 17
id: setup-java-17
uses: actions/setup-java@v2.2.0
uses: actions/setup-java@v2
with:
distribution: 'zulu'
java-version: '17.0.0'
distribution: 'temurin'
java-version: '17'

- name: Set JAVA_HOME
run: echo "JAVA_HOME=${{ steps.setup-java-11.outputs.path }}" >> $GITHUB_ENV
Expand Down
40 changes: 20 additions & 20 deletions .github/workflows/nightly-check-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,17 +19,17 @@ jobs:

- name: Setup JDK 11
id: setup-java-11
uses: actions/setup-java@v2.2.0
uses: actions/setup-java@v2
with:
distribution: 'zulu'
distribution: 'temurin'
java-version: '11'

- name: Setup JDK 17
id: setup-java-17
uses: actions/setup-java@v2.2.0
uses: actions/setup-java@v2
with:
distribution: 'zulu'
java-version: '17.0.0'
distribution: 'temurin'
java-version: '17'

- name: Set JAVA_HOME
run: echo "JAVA_HOME=${{ steps.setup-java-11.outputs.path }}" >> $GITHUB_ENV
Expand Down Expand Up @@ -95,17 +95,17 @@ jobs:

- name: Setup JDK 11
id: setup-java-11
uses: actions/setup-java@v2.2.0
uses: actions/setup-java@v2
with:
distribution: 'zulu'
distribution: 'temurin'
java-version: '11'

- name: Setup JDK 17
id: setup-java-17
uses: actions/setup-java@v2.2.0
uses: actions/setup-java@v2
with:
distribution: 'zulu'
java-version: '17.0.0'
distribution: 'temurin'
java-version: '17'

- name: Set JAVA_HOME
run: echo "JAVA_HOME=${{ steps.setup-java-11.outputs.path }}" >> $GITHUB_ENV
Expand Down Expand Up @@ -171,17 +171,17 @@ jobs:

- name: Setup JDK 11
id: setup-java-11
uses: actions/setup-java@v2.2.0
uses: actions/setup-java@v2
with:
distribution: 'zulu'
distribution: 'temurin'
java-version: '11'

- name: Setup JDK 17
id: setup-java-17
uses: actions/setup-java@v2.2.0
uses: actions/setup-java@v2
with:
distribution: 'zulu'
java-version: '17.0.0'
distribution: 'temurin'
java-version: '17'

- name: Set JAVA_HOME
run: echo "JAVA_HOME=${{ steps.setup-java-11.outputs.path }}" >> $GITHUB_ENV
Expand Down Expand Up @@ -247,17 +247,17 @@ jobs:

- name: Setup JDK 11
id: setup-java-11
uses: actions/setup-java@v2.2.0
uses: actions/setup-java@v2
with:
distribution: 'zulu'
distribution: 'temurin'
java-version: '11'

- name: Setup JDK 17
id: setup-java-17
uses: actions/setup-java@v2.2.0
uses: actions/setup-java@v2
with:
distribution: 'zulu'
java-version: '17.0.0'
distribution: 'temurin'
java-version: '17'

- name: Set JAVA_HOME
run: echo "JAVA_HOME=${{ steps.setup-java-11.outputs.path }}" >> $GITHUB_ENV
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/publish-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,17 +13,17 @@ jobs:

- name: Setup JDK 11
id: setup-java-11
uses: actions/setup-java@v2.2.0
uses: actions/setup-java@v2
with:
distribution: 'zulu'
distribution: 'temurin'
java-version: '11'

- name: Setup JDK 17
id: setup-java-17
uses: actions/setup-java@v2.2.0
uses: actions/setup-java@v2
with:
distribution: 'zulu'
java-version: '17.0.0'
distribution: 'temurin'
java-version: '17'

- name: Set JAVA_HOME
run: echo "JAVA_HOME=${{ steps.setup-java-11.outputs.path }}" >> $GITHUB_ENV
Expand Down
1 change: 1 addition & 0 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -337,6 +337,7 @@ apply plugin: 'io.deephaven.java-conventions'
String javaDocOverviewLocation = 'build/docs/overview.html'
tasks.register 'allJavadoc', Javadoc, {
Javadoc jdoc ->
// TODO(deephaven-core#1513): Remove non-LTS JDK 15 as part of javadocs process
jdoc.javadocTool = javaToolchains.javadocToolFor{it ->
// Javadoc version >=11 is needed for search
// Javadoc version >12 is needed to avoid javadoc bugs in linking with modules
Expand Down

0 comments on commit 2f13538

Please sign in to comment.