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.

Sign up for GitHub

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

Jump to bottom

Upgrade compiler to JDK17, fixes #1367. #1397

Merged
merged 8 commits into from
Oct 19, 2021
Merged

Upgrade compiler to JDK17, fixes #1367. #1397

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
0ebb747
Upgrade compiler to JDK17, fixes #1367.
devinrsmith Oct 1, 2021
433eb7b
Upgrade groovy to 3.0.9
devinrsmith Oct 7, 2021
699dc66
Merge remote-tracking branch 'upstream/main' into upgrade-java/compiler
devinrsmith Oct 12, 2021
d826f04
Set JAVA_HOME
devinrsmith Oct 14, 2021
e452200
Be more explicit that lang-tools test depends on groovy explicitly
devinrsmith Oct 14, 2021
2c83cfc
Add groovy inheritance to Classpaths
devinrsmith Oct 14, 2021
7aa4227
Merge remote-tracking branch 'upstream/main' into upgrade-java/compiler
devinrsmith Oct 15, 2021
84cca2b
Use Classpaths for junit BOM
devinrsmith Oct 15, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
98 changes: 68 additions & 30 deletions .github/workflows/build-ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,28 @@ jobs:
- name: Checkout
uses: actions/checkout@v2

# note: this uses Zulu and not AdoptOpenJDK or other. should make sure we build and test on the same one...
- name: Setup JDK
id: setup-java
- name: Setup JDK 8
id: setup-java-8
uses: actions/setup-java@v2.2.0
with:
distribution: 'zulu'
java-version: '8.0.302'

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

- name: Set JAVA_HOME
run: echo "JAVA_HOME=${{ steps.setup-java-8.outputs.path }}" >> $GITHUB_ENV

- name: Setup gradle properties
run: |
cat .github/env/${{ runner.os }}/gradle.properties >> gradle.properties
echo "org.gradle.java.installations.paths=${{ steps.setup-java-8.outputs.path }},${{ steps.setup-java-17.outputs.path }}," >> gradle.properties

- name: Get Semver
id: semver
if: ${{ startsWith(github.ref, 'refs/heads/release/v') }}
Expand Down Expand Up @@ -58,11 +72,6 @@ jobs:
username: ${{ github.actor }}
password: ${{ secrets.GITHUB_TOKEN }}

- name: Setup gradle properties
run: |
cat .github/env/${{ runner.os }}/gradle.properties >> gradle.properties
echo "org.gradle.java.installations.paths=${{ steps.setup-java.outputs.path }}" >> gradle.properties

- name: Create Dockerfile and context
uses: burrunan/gradle-cache-action@v1
with:
Expand All @@ -88,13 +97,28 @@ jobs:
- name: Checkout
uses: actions/checkout@v2

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

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

- name: Set JAVA_HOME
run: echo "JAVA_HOME=${{ steps.setup-java-8.outputs.path }}" >> $GITHUB_ENV

- name: Setup gradle properties
run: |
cat .github/env/${{ runner.os }}/gradle.properties >> gradle.properties
echo "org.gradle.java.installations.paths=${{ steps.setup-java-8.outputs.path }},${{ steps.setup-java-17.outputs.path }}," >> gradle.properties

- name: Get Semver
id: semver
if: ${{ startsWith(github.ref, 'refs/heads/release/v') }}
Expand Down Expand Up @@ -133,11 +157,6 @@ jobs:
username: ${{ github.actor }}
password: ${{ secrets.GITHUB_TOKEN }}

- name: Setup gradle properties
run: |
cat .github/env/${{ runner.os }}/gradle.properties >> gradle.properties
echo "org.gradle.java.installations.paths=${{ steps.setup-java.outputs.path }}" >> gradle.properties

- name: Create Dockerfile and context
uses: burrunan/gradle-cache-action@v1
with:
Expand All @@ -160,13 +179,28 @@ jobs:
- name: Checkout
uses: actions/checkout@v2

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

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

- name: Set JAVA_HOME
run: echo "JAVA_HOME=${{ steps.setup-java-8.outputs.path }}" >> $GITHUB_ENV

- name: Setup gradle properties
run: |
cat .github/env/${{ runner.os }}/gradle.properties >> gradle.properties
echo "org.gradle.java.installations.paths=${{ steps.setup-java-8.outputs.path }},${{ steps.setup-java-17.outputs.path }}," >> gradle.properties

- name: Get Semver
id: semver
if: ${{ startsWith(github.ref, 'refs/heads/release/v') }}
Expand Down Expand Up @@ -205,11 +239,6 @@ jobs:
username: ${{ github.actor }}
password: ${{ secrets.GITHUB_TOKEN }}

- name: Setup gradle properties
run: |
cat .github/env/${{ runner.os }}/gradle.properties >> gradle.properties
echo "org.gradle.java.installations.paths=${{ steps.setup-java.outputs.path }}" >> gradle.properties

- name: Create Dockerfile and context
uses: burrunan/gradle-cache-action@v1
with:
Expand Down Expand Up @@ -256,14 +285,28 @@ jobs:
org.opencontainers.image.description=Deephaven web
org.opencontainers.image.licenses=Deephaven Community License Agreement 1.0

# note: this uses Zulu and not AdoptOpenJDK or other. should make sure we build and test on the same one...
- name: Setup JDK
id: setup-java
- name: Setup JDK 8
id: setup-java-8
uses: actions/setup-java@v2.2.0
with:
distribution: 'zulu'
java-version: '8.0.302'

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

- name: Set JAVA_HOME
run: echo "JAVA_HOME=${{ steps.setup-java-8.outputs.path }}" >> $GITHUB_ENV

- name: Setup gradle properties
run: |
cat .github/env/${{ runner.os }}/gradle.properties >> gradle.properties
echo "org.gradle.java.installations.paths=${{ steps.setup-java-8.outputs.path }},${{ steps.setup-java-17.outputs.path }}," >> gradle.properties

- name: Set up Docker Buildx
id: buildx
uses: docker/setup-buildx-action@v1.3.0
Expand All @@ -279,11 +322,6 @@ jobs:
username: ${{ github.actor }}
password: ${{ secrets.GITHUB_TOKEN }}

- name: Setup gradle properties
run: |
cat .github/env/${{ runner.os }}/gradle.properties >> gradle.properties
echo "org.gradle.java.installations.paths=${{ steps.setup-java.outputs.path }}" >> gradle.properties

- name: Create Dockerfile and context
uses: burrunan/gradle-cache-action@v1
with:
Expand Down
17 changes: 13 additions & 4 deletions .github/workflows/check-ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,18 +16,27 @@ jobs:
- name: Check gitignore rules
run: .github/scripts/check-gitignore-rules.sh

# note: this uses Zulu and not AdoptOpenJDK or other. should make sure we build and test on the same one...
- name: Setup JDK
id: setup-java
- name: Setup JDK 8
id: setup-java-8
uses: actions/setup-java@v2.2.0
with:
distribution: 'zulu'
java-version: '8.0.302'

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

- name: Set JAVA_HOME
run: echo "JAVA_HOME=${{ steps.setup-java-8.outputs.path }}" >> $GITHUB_ENV

- name: Setup gradle properties
run: |
cat .github/env/${{ runner.os }}/gradle.properties >> gradle.properties
echo "org.gradle.java.installations.paths=${{ steps.setup-java.outputs.path }}" >> gradle.properties
echo "org.gradle.java.installations.paths=${{ steps.setup-java-8.outputs.path }},${{ steps.setup-java-17.outputs.path }}," >> gradle.properties

- name: Check
uses: burrunan/gradle-cache-action@v1
Expand Down
39 changes: 31 additions & 8 deletions .github/workflows/docs-ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,24 +13,34 @@ jobs:
- name: Checkout
uses: actions/checkout@v2

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

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

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

- name: Set JAVA_HOME
run: echo "JAVA_HOME=${{ steps.setup-java-8.outputs.path }}" >> $GITHUB_ENV

- name: Setup gradle properties
run: |
cat .github/env/${{ runner.os }}/gradle.properties >> gradle.properties
echo "org.gradle.java.installations.paths=${{ steps.setup-java-8.outputs.path }},${{ steps.setup-java-15.outputs.path }}" >> gradle.properties
echo "org.gradle.java.installations.paths=${{ steps.setup-java-8.outputs.path }},${{ steps.setup-java-15.outputs.path }},${{ steps.setup-java-17.outputs.path }}" >> gradle.properties

- name: All Javadoc
uses: burrunan/gradle-cache-action@v1
Expand Down Expand Up @@ -64,24 +74,34 @@ jobs:
- name: Checkout
uses: actions/checkout@v2

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

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

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

- name: Set JAVA_HOME
run: echo "JAVA_HOME=${{ steps.setup-java-8.outputs.path }}" >> $GITHUB_ENV

- name: Setup gradle properties
run: |
cat .github/env/${{ runner.os }}/gradle.properties >> gradle.properties
echo "org.gradle.java.installations.paths=${{ steps.setup-java-8.outputs.path }},${{ steps.setup-java-15.outputs.path }}" >> gradle.properties
echo "org.gradle.java.installations.paths=${{ steps.setup-java-8.outputs.path }},${{ steps.setup-java-15.outputs.path }},${{ steps.setup-java-17.outputs.path }}" >> gradle.properties

- name: Generate Python Docs
uses: burrunan/gradle-cache-action@v1
Expand Down Expand Up @@ -127,6 +147,9 @@ jobs:
distribution: 'zulu'
java-version: '8.0.302'

- name: Set JAVA_HOME
run: echo "JAVA_HOME=${{ steps.setup-java-8.outputs.path }}" >> $GITHUB_ENV

- name: Setup gradle properties
run: |
cat .github/env/${{ runner.os }}/gradle.properties >> gradle.properties
Expand Down
17 changes: 13 additions & 4 deletions .github/workflows/long-check-ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,18 +13,27 @@ jobs:
- name: Checkout
uses: actions/checkout@v2

# note: this uses Zulu and not AdoptOpenJDK or other. should make sure we build and test on the same one...
- name: Setup JDK
id: setup-java
- name: Setup JDK 8
id: setup-java-8
uses: actions/setup-java@v2.2.0
with:
distribution: 'zulu'
java-version: '8.0.302'

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

- name: Set JAVA_HOME
run: echo "JAVA_HOME=${{ steps.setup-java-8.outputs.path }}" >> $GITHUB_ENV

- name: Setup gradle properties
run: |
cat .github/env/${{ runner.os }}/gradle.properties >> gradle.properties
echo "org.gradle.java.installations.paths=${{ steps.setup-java.outputs.path }}" >> gradle.properties
echo "org.gradle.java.installations.paths=${{ steps.setup-java-8.outputs.path }},${{ steps.setup-java-17.outputs.path }}," >> gradle.properties

- name: Check
uses: burrunan/gradle-cache-action@v1
Expand Down
17 changes: 13 additions & 4 deletions .github/workflows/nightly-benchmarks.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,18 +14,27 @@ jobs:
- name: Checkout
uses: actions/checkout@v2

# note: this uses Zulu and not AdoptOpenJDK or other. should make sure we build and test on the same one...
- name: Setup JDK
id: setup-java
- name: Setup JDK 8
id: setup-java-8
uses: actions/setup-java@v2.2.0
with:
distribution: 'zulu'
java-version: '8.0.302'

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

- name: Set JAVA_HOME
run: echo "JAVA_HOME=${{ steps.setup-java-8.outputs.path }}" >> $GITHUB_ENV

- name: Setup gradle properties
run: |
cat .github/env/${{ runner.os }}/gradle.properties >> gradle.properties
echo "org.gradle.java.installations.paths=${{ steps.setup-java.outputs.path }}" >> gradle.properties
echo "org.gradle.java.installations.paths=${{ steps.setup-java-8.outputs.path }},${{ steps.setup-java-17.outputs.path }}," >> gradle.properties

- name: Build
uses: burrunan/gradle-cache-action@v1
Expand Down