Skip to content

Commit a3843f6

Browse files
aanejaZacBlancoimjalpreet
authored and
rschlussel
committed
Add JDK 17 build support
along with existing support for JDK 8 Co-authored-by: Zac Blanco <[email protected]> Co-authored-by: Jalpreet Singh Nanda (:imjalpreet) <[email protected]>
1 parent ee6e83d commit a3843f6

File tree

33 files changed

+402
-76
lines changed

33 files changed

+402
-76
lines changed

‎.github/workflows/cleanup.yml

Lines changed: 0 additions & 42 deletions
This file was deleted.

‎.github/workflows/hive-tests.yml

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,12 +31,16 @@ jobs:
3131
- '!presto-docs/**'
3232
3333
hive-tests:
34+
strategy:
35+
fail-fast: false
36+
matrix:
37+
java: [ 8, 17.0.13 ]
3438
runs-on: ubuntu-latest
3539
needs: changes
3640
if: needs.changes.outputs.codechange == 'true'
3741
timeout-minutes: 60
3842
concurrency:
39-
group: ${{ github.workflow }}-hive-tests-${{ github.event.pull_request.number }}
43+
group: ${{ github.workflow }}-hive-tests-${{ github.event.pull_request.number }}-${{ matrix.java }}
4044
cancel-in-progress: true
4145
steps:
4246
- uses: actions/checkout@v4
@@ -45,7 +49,7 @@ jobs:
4549
- uses: actions/setup-java@v4
4650
with:
4751
distribution: 'temurin'
48-
java-version: 8
52+
java-version: ${{ matrix.java }}
4953
cache: 'maven'
5054
- name: Download nodejs to maven cache
5155
run: .github/bin/download_nodejs
@@ -75,12 +79,16 @@ jobs:
7579
fi
7680
7781
hive-dockerized-tests:
82+
strategy:
83+
fail-fast: false
84+
matrix:
85+
java: [ 8, 17.0.13 ]
7886
runs-on: ubuntu-latest
7987
needs: changes
8088
if: needs.changes.outputs.codechange == 'true'
8189
timeout-minutes: 20
8290
concurrency:
83-
group: ${{ github.workflow }}-hive-dockerized-tests-${{ github.event.pull_request.number }}
91+
group: ${{ github.workflow }}-hive-dockerized-tests-${{ github.event.pull_request.number }}-${{ matrix.java }}
8492
cancel-in-progress: true
8593
steps:
8694
- uses: actions/checkout@v4
@@ -89,7 +97,7 @@ jobs:
8997
- uses: actions/setup-java@v4
9098
with:
9199
distribution: 'temurin'
92-
java-version: 8
100+
java-version: ${{ matrix.java }}
93101
cache: 'maven'
94102
- name: Download nodejs to maven cache
95103
run: .github/bin/download_nodejs

‎.github/workflows/kudu.yml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,12 +29,16 @@ jobs:
2929
codechange:
3030
- '!presto-docs/**'
3131
kudu:
32+
strategy:
33+
fail-fast: false
34+
matrix:
35+
java: [ 8, 17.0.13 ]
3236
runs-on: ubuntu-latest
3337
needs: changes
3438
if: needs.changes.outputs.codechange == 'true'
3539
timeout-minutes: 60
3640
concurrency:
37-
group: ${{ github.workflow }}-kudu-${{ github.event.pull_request.number }}
41+
group: ${{ github.workflow }}-kudu-${{ github.event.pull_request.number }}-${{ matrix.java }}
3842
cancel-in-progress: true
3943
steps:
4044
- uses: actions/checkout@v4
@@ -43,7 +47,7 @@ jobs:
4347
- uses: actions/setup-java@v4
4448
with:
4549
distribution: 'temurin'
46-
java-version: 8
50+
java-version: ${{ matrix.java }}
4751
cache: 'maven'
4852
- name: Download nodejs to maven cache
4953
run: .github/bin/download_nodejs

‎.github/workflows/maven-checks.yml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,14 @@ env:
1212

1313
jobs:
1414
maven-checks:
15+
strategy:
16+
fail-fast: false
17+
matrix:
18+
java: [ 8, 17.0.13 ]
1519
runs-on: ubuntu-latest
1620
timeout-minutes: 45
1721
concurrency:
18-
group: ${{ github.workflow }}-maven-checks-${{ github.event.pull_request.number }}
22+
group: ${{ github.workflow }}-maven-checks-${{ github.event.pull_request.number }}-${{ matrix.java }}
1923
cancel-in-progress: true
2024
steps:
2125
- name: Free Disk Space
@@ -29,7 +33,7 @@ jobs:
2933
- uses: actions/setup-java@v4
3034
with:
3135
distribution: 'temurin'
32-
java-version: 8
36+
java-version: ${{ matrix.java }}
3337
cache: 'maven'
3438
- name: Download nodejs to maven cache
3539
run: .github/bin/download_nodejs

‎.github/workflows/product-tests-basic-environment.yml

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,12 +29,16 @@ jobs:
2929
codechange:
3030
- '!presto-docs/**'
3131
product-tests-basic-environment:
32+
strategy:
33+
fail-fast: false
34+
matrix:
35+
java: [ 8, 17.0.13 ]
3236
runs-on: ubuntu-latest
3337
needs: changes
3438
if: needs.changes.outputs.codechange == 'true'
3539
timeout-minutes: 60
3640
concurrency:
37-
group: ${{ github.workflow }}-product-tests-basic-environment-${{ github.event.pull_request.number }}
41+
group: ${{ github.workflow }}-product-tests-basic-environment-${{ github.event.pull_request.number }}-${{ matrix.java }}
3842
cancel-in-progress: true
3943
steps:
4044
- name: Free Disk Space
@@ -49,7 +53,7 @@ jobs:
4953
- uses: actions/setup-java@v4
5054
with:
5155
distribution: 'temurin'
52-
java-version: 8
56+
java-version: ${{ matrix.java }}
5357
cache: 'maven'
5458
- name: Download nodejs to maven cache
5559
run: .github/bin/download_nodejs
@@ -58,4 +62,6 @@ jobs:
5862
export MAVEN_OPTS="${MAVEN_INSTALL_OPTS}"
5963
./mvnw install ${MAVEN_FAST_INSTALL} -am -pl '!presto-docs,!presto-spark-package,!presto-spark-launcher,!presto-spark-testing,!presto-test-coverage'
6064
- name: Run Product Tests Basic Environment
65+
env:
66+
OVERRIDE_JDK_DIR: ${{ env.JAVA_HOME }}
6167
run: presto-product-tests/bin/run_on_docker.sh multinode -x quarantine,big_query,storage_formats,profile_specific_tests,tpcds,cassandra,mysql_connector,postgresql_connector,mysql,kafka,avro

‎.github/workflows/product-tests-specific-environment.yml

Lines changed: 36 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,12 +29,16 @@ jobs:
2929
codechange:
3030
- '!presto-docs/**'
3131
product-tests-specific-environment1:
32+
strategy:
33+
fail-fast: false
34+
matrix:
35+
java: [ 8, 17.0.13 ]
3236
runs-on: ubuntu-latest
3337
needs: changes
3438
if: needs.changes.outputs.codechange == 'true'
3539
timeout-minutes: 60
3640
concurrency:
37-
group: ${{ github.workflow }}-product-tests-specific-environment1-${{ github.event.pull_request.number }}
41+
group: ${{ github.workflow }}-product-tests-specific-environment1-${{ github.event.pull_request.number }}-${{ matrix.java }}
3842
cancel-in-progress: true
3943
steps:
4044
- name: Free Disk Space
@@ -49,7 +53,7 @@ jobs:
4953
- uses: actions/setup-java@v4
5054
with:
5155
distribution: 'temurin'
52-
java-version: 8
56+
java-version: ${{ matrix.java }}
5357
cache: 'maven'
5458
- name: Download nodejs to maven cache
5559
run: .github/bin/download_nodejs
@@ -58,26 +62,40 @@ jobs:
5862
export MAVEN_OPTS="${MAVEN_INSTALL_OPTS}"
5963
./mvnw install ${MAVEN_FAST_INSTALL} -am -pl '!presto-docs,!presto-spark-package,!presto-spark-launcher,!presto-spark-testing,!presto-test-coverage'
6064
- name: Product Tests Specific 1.1
65+
env:
66+
OVERRIDE_JDK_DIR: ${{ env.JAVA_HOME }}
6167
run: presto-product-tests/bin/run_on_docker.sh singlenode -g hdfs_no_impersonation,avro
6268
- name: Product Tests Specific 1.2
69+
env:
70+
OVERRIDE_JDK_DIR: ${{ env.JAVA_HOME }}
6371
run: presto-product-tests/bin/run_on_docker.sh singlenode-kerberos-hdfs-no-impersonation -g hdfs_no_impersonation
6472
# temporarily disable this flaky run. see issue #20388 for details
6573
# - name: Product Tests Specific 1.3
6674
# run: presto-product-tests/bin/run_on_docker.sh singlenode-hdfs-impersonation -g storage_formats,cli,hdfs_impersonation
6775
- name: Product Tests Specific 1.4
76+
env:
77+
OVERRIDE_JDK_DIR: ${{ env.JAVA_HOME }}
6878
run: presto-product-tests/bin/run_on_docker.sh singlenode-kerberos-hdfs-impersonation -g storage_formats,cli,hdfs_impersonation,authorization,hive_file_header
6979
- name: Product Tests Specific 1.5
80+
env:
81+
OVERRIDE_JDK_DIR: ${{ env.JAVA_HOME }}
7082
run: presto-product-tests/bin/run_on_docker.sh singlenode-kerberos-hdfs-impersonation-cross-realm -g storage_formats,cli,hdfs_impersonation
7183
- name: Product Tests Specific 1.6
84+
env:
85+
OVERRIDE_JDK_DIR: ${{ env.JAVA_HOME }}
7286
run: presto-product-tests/bin/run_on_docker.sh multinode-tls-kerberos -g cli,group-by,join,tls
7387

7488
product-tests-specific-environment2:
89+
strategy:
90+
fail-fast: false
91+
matrix:
92+
java: [ 8, 17.0.13 ]
7593
runs-on: ubuntu-latest
7694
needs: changes
7795
if: needs.changes.outputs.codechange == 'true'
7896
timeout-minutes: 60
7997
concurrency:
80-
group: ${{ github.workflow }}-product-tests-specific-environment2-${{ github.event.pull_request.number }}
98+
group: ${{ github.workflow }}-product-tests-specific-environment2-${{ github.event.pull_request.number }}-${{ matrix.java }}
8199
cancel-in-progress: true
82100
steps:
83101
- name: Free Disk Space
@@ -92,7 +110,7 @@ jobs:
92110
- uses: actions/setup-java@v4
93111
with:
94112
distribution: 'temurin'
95-
java-version: 8
113+
java-version: ${{ matrix.java }}
96114
cache: 'maven'
97115
- name: Download nodejs to maven cache
98116
run: .github/bin/download_nodejs
@@ -101,19 +119,33 @@ jobs:
101119
export MAVEN_OPTS="${MAVEN_INSTALL_OPTS}"
102120
./mvnw install ${MAVEN_FAST_INSTALL} -am -pl '!presto-docs,!presto-spark-package,!presto-spark-launcher,!presto-spark-testing,!presto-test-coverage'
103121
- name: Product Tests Specific 2.1
122+
env:
123+
OVERRIDE_JDK_DIR: ${{ env.JAVA_HOME }}
104124
run: presto-product-tests/bin/run_on_docker.sh singlenode-ldap -g ldap -x simba_jdbc
105125
- name: Product Tests Specific 2.2
126+
env:
127+
OVERRIDE_JDK_DIR: ${{ env.JAVA_HOME }}
106128
run: presto-product-tests/bin/run_on_docker.sh multinode-tls -g smoke,cli,group-by,join,tls
107129
- name: Product Tests Specific 2.3
130+
env:
131+
OVERRIDE_JDK_DIR: ${{ env.JAVA_HOME }}
108132
run: presto-product-tests/bin/run_on_docker.sh singlenode-mysql -g mysql_connector,mysql
109133
- name: Product Tests Specific 2.4
134+
env:
135+
OVERRIDE_JDK_DIR: ${{ env.JAVA_HOME }}
110136
run: presto-product-tests/bin/run_on_docker.sh singlenode-postgresql -g postgresql_connector
111137
- name: Product Tests Specific 2.5
138+
env:
139+
OVERRIDE_JDK_DIR: ${{ env.JAVA_HOME }}
112140
run: presto-product-tests/bin/run_on_docker.sh singlenode-cassandra -g cassandra
113141
# temporarily disable this flaky run. see issue #20388 for details
114142
# - name: Product Tests Specific 2.6
115143
# run: presto-product-tests/bin/run_on_docker.sh singlenode-kerberos-hdfs-impersonation-with-wire-encryption -g storage_formats,cli,hdfs_impersonation,authorization
116144
- name: Product Tests Specific 2.7
145+
env:
146+
OVERRIDE_JDK_DIR: ${{ env.JAVA_HOME }}
117147
run: presto-product-tests/bin/run_on_docker.sh singlenode-kafka -g kafka
118148
- name: Product Tests Specific 2.8
149+
env:
150+
OVERRIDE_JDK_DIR: ${{ env.JAVA_HOME }}
119151
run: presto-product-tests/bin/run_on_docker.sh singlenode-sqlserver -g sqlserver

‎.github/workflows/singlestore-tests.yml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,13 +30,17 @@ jobs:
3030
codechange:
3131
- '!presto-docs/**'
3232
singlestore-dockerized-tests:
33+
strategy:
34+
fail-fast: false
35+
matrix:
36+
java: [ 8, 17.0.13 ]
3337
runs-on: ubuntu-latest
3438
needs: changes
3539
if: needs.changes.outputs.codechange == 'true'
3640

3741
timeout-minutes: 30
3842
concurrency:
39-
group: ${{ github.workflow }}-singlestore-dockerized-tests-${{ github.event.pull_request.number }}
43+
group: ${{ github.workflow }}-singlestore-dockerized-tests-${{ github.event.pull_request.number }}-${{ matrix.java }}
4044
cancel-in-progress: true
4145
steps:
4246
- uses: actions/checkout@v4
@@ -56,7 +60,7 @@ jobs:
5660
- uses: actions/setup-java@v4
5761
with:
5862
distribution: 'temurin'
59-
java-version: 8
63+
java-version: ${{ matrix.java }}
6064
cache: 'maven'
6165
- name: Download nodejs to maven cache
6266
run: .github/bin/download_nodejs

‎.github/workflows/spark-integration.yml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,12 +30,16 @@ jobs:
3030
codechange:
3131
- '!presto-docs/**'
3232
spark-integration:
33+
strategy:
34+
fail-fast: false
35+
matrix:
36+
java: [ 8, 17.0.13 ]
3337
runs-on: ubuntu-latest
3438
needs: changes
3539
if: needs.changes.outputs.codechange == 'true'
3640
timeout-minutes: 60
3741
concurrency:
38-
group: ${{ github.workflow }}-spark-integration-${{ github.event.pull_request.number }}
42+
group: ${{ github.workflow }}-spark-integration-${{ github.event.pull_request.number }}-${{ matrix.java }}
3943
cancel-in-progress: true
4044
steps:
4145
- uses: actions/checkout@v4
@@ -44,7 +48,7 @@ jobs:
4448
- uses: actions/setup-java@v4
4549
with:
4650
distribution: 'temurin'
47-
java-version: 8
51+
java-version: ${{ matrix.java }}
4852
cache: 'maven'
4953
- name: Download nodejs to maven cache
5054
run: .github/bin/download_nodejs

‎.github/workflows/test-other-modules.yml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,12 +30,16 @@ jobs:
3030
codechange:
3131
- '!presto-docs/**'
3232
test-other-modules:
33+
strategy:
34+
fail-fast: false
35+
matrix:
36+
java: [ 8, 17.0.13 ]
3337
runs-on: ubuntu-latest
3438
needs: changes
3539
if: needs.changes.outputs.codechange == 'true'
3640
timeout-minutes: 60
3741
concurrency:
38-
group: ${{ github.workflow }}-test-other-modules-${{ github.event.pull_request.number }}
42+
group: ${{ github.workflow }}-test-other-modules-${{ github.event.pull_request.number }}-${{ matrix.java }}
3943
cancel-in-progress: true
4044
steps:
4145
- uses: actions/checkout@v4
@@ -44,7 +48,7 @@ jobs:
4448
- uses: actions/setup-java@v4
4549
with:
4650
distribution: 'temurin'
47-
java-version: 8
51+
java-version: ${{ matrix.java }}
4852
cache: 'maven'
4953
- name: Download nodejs to maven cache
5054
run: .github/bin/download_nodejs

0 commit comments

Comments
 (0)