Skip to content

Commit

Permalink
Use matrix to test java 8 and 17 with GH actions
Browse files Browse the repository at this point in the history
  • Loading branch information
ZacBlanco committed Oct 15, 2024
1 parent b8617ef commit 6b1917b
Show file tree
Hide file tree
Showing 10 changed files with 53 additions and 64 deletions.
42 changes: 0 additions & 42 deletions .github/workflows/cleanup.yml

This file was deleted.

14 changes: 10 additions & 4 deletions .github/workflows/hive-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,12 +31,15 @@ jobs:
- '!presto-docs/**'
hive-tests:
strategy:
matrix:
java: [ 8, 17 ]
runs-on: ubuntu-latest
needs: changes
if: needs.changes.outputs.codechange == 'true'
timeout-minutes: 60
concurrency:
group: ${{ github.workflow }}-hive-tests-${{ github.event.pull_request.number }}
group: ${{ github.workflow }}-hive-tests-${{ github.event.pull_request.number }}-${{ matrix.java }}
cancel-in-progress: true
steps:
- uses: actions/checkout@v4
Expand All @@ -45,7 +48,7 @@ jobs:
- uses: actions/setup-java@v2
with:
distribution: 'temurin'
java-version: 17
java-version: ${{ matrix.java }}
- name: Cache local Maven repository
id: cache-maven
uses: actions/cache@v2
Expand Down Expand Up @@ -83,12 +86,15 @@ jobs:
fi
hive-dockerized-tests:
strategy:
matrix:
java: [ 8, 17 ]
runs-on: ubuntu-latest
needs: changes
if: needs.changes.outputs.codechange == 'true'
timeout-minutes: 20
concurrency:
group: ${{ github.workflow }}-hive-dockerized-tests-${{ github.event.pull_request.number }}
group: ${{ github.workflow }}-hive-dockerized-tests-${{ github.event.pull_request.number }}-${{ matrix.java }}
cancel-in-progress: true
steps:
- uses: actions/checkout@v4
Expand All @@ -97,7 +103,7 @@ jobs:
- uses: actions/setup-java@v2
with:
distribution: 'temurin'
java-version: 17
java-version: ${{ matrix.java }}
- name: Cache local Maven repository
id: cache-maven
uses: actions/cache@v2
Expand Down
7 changes: 5 additions & 2 deletions .github/workflows/kudu.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,12 +29,15 @@ jobs:
codechange:
- '!presto-docs/**'
kudu:
strategy:
matrix:
java: [ 8, 17 ]
runs-on: ubuntu-latest
needs: changes
if: needs.changes.outputs.codechange == 'true'
timeout-minutes: 60
concurrency:
group: ${{ github.workflow }}-kudu-${{ github.event.pull_request.number }}
group: ${{ github.workflow }}-kudu-${{ github.event.pull_request.number }}-${{ matrix.java }}
cancel-in-progress: true
steps:
- uses: actions/checkout@v4
Expand All @@ -43,7 +46,7 @@ jobs:
- uses: actions/setup-java@v2
with:
distribution: 'temurin'
java-version: 17
java-version: ${{ matrix.java }}
- name: Cache local Maven repository
id: cache-maven
uses: actions/cache@v2
Expand Down
7 changes: 5 additions & 2 deletions .github/workflows/maven-checks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,13 @@ env:

jobs:
maven-checks:
strategy:
matrix:
java: [ 8, 17 ]
runs-on: ubuntu-latest
timeout-minutes: 45
concurrency:
group: ${{ github.workflow }}-maven-checks-${{ github.event.pull_request.number }}
group: ${{ github.workflow }}-maven-checks-${{ github.event.pull_request.number }}-${{ matrix.java }}
cancel-in-progress: true
steps:
- name: Free Disk Space
Expand All @@ -29,7 +32,7 @@ jobs:
- uses: actions/setup-java@v2
with:
distribution: 'temurin'
java-version: 17
java-version: ${{ matrix.java }}
- name: Cache local Maven repository
id: cache-maven
uses: actions/cache@v2
Expand Down
7 changes: 5 additions & 2 deletions .github/workflows/product-tests-basic-environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,12 +29,15 @@ jobs:
codechange:
- '!presto-docs/**'
product-tests-basic-environment:
strategy:
matrix:
java: [ 8, 17 ]
runs-on: ubuntu-latest
needs: changes
if: needs.changes.outputs.codechange == 'true'
timeout-minutes: 60
concurrency:
group: ${{ github.workflow }}-product-tests-basic-environment-${{ github.event.pull_request.number }}
group: ${{ github.workflow }}-product-tests-basic-environment-${{ github.event.pull_request.number }}-${{ matrix.java }}
cancel-in-progress: true
steps:
- name: Free Disk Space
Expand All @@ -49,7 +52,7 @@ jobs:
- uses: actions/setup-java@v2
with:
distribution: 'temurin'
java-version: 17
java-version: ${{ matrix.java }}
- name: Cache local Maven repository
id: cache-maven
uses: actions/cache@v2
Expand Down
14 changes: 10 additions & 4 deletions .github/workflows/product-tests-specific-environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,12 +29,15 @@ jobs:
codechange:
- '!presto-docs/**'
product-tests-specific-environment1:
strategy:
matrix:
java: [ 8, 17 ]
runs-on: ubuntu-latest
needs: changes
if: needs.changes.outputs.codechange == 'true'
timeout-minutes: 60
concurrency:
group: ${{ github.workflow }}-product-tests-specific-environment1-${{ github.event.pull_request.number }}
group: ${{ github.workflow }}-product-tests-specific-environment1-${{ github.event.pull_request.number }}-${{ matrix.java }}
cancel-in-progress: true
steps:
- name: Free Disk Space
Expand All @@ -49,7 +52,7 @@ jobs:
- uses: actions/setup-java@v2
with:
distribution: 'temurin'
java-version: 17
java-version: ${{ matrix.java }}
- name: Cache local Maven repository
id: cache-maven
uses: actions/cache@v2
Expand Down Expand Up @@ -80,12 +83,15 @@ jobs:
run: presto-product-tests/bin/run_on_docker.sh multinode-tls-kerberos -g cli,group-by,join,tls

product-tests-specific-environment2:
strategy:
matrix:
java: [ 8, 17 ]
runs-on: ubuntu-latest
needs: changes
if: needs.changes.outputs.codechange == 'true'
timeout-minutes: 60
concurrency:
group: ${{ github.workflow }}-product-tests-specific-environment2-${{ github.event.pull_request.number }}
group: ${{ github.workflow }}-product-tests-specific-environment2-${{ github.event.pull_request.number }}-${{ matrix.java }}
cancel-in-progress: true
steps:
- name: Free Disk Space
Expand All @@ -100,7 +106,7 @@ jobs:
- uses: actions/setup-java@v2
with:
distribution: 'temurin'
java-version: 17
java-version: ${{ matrix.java }}
- name: Cache local Maven repository
id: cache-maven
uses: actions/cache@v2
Expand Down
7 changes: 5 additions & 2 deletions .github/workflows/singlestore-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,13 +30,16 @@ jobs:
codechange:
- '!presto-docs/**'
singlestore-dockerized-tests:
strategy:
matrix:
java: [ 8, 17 ]
runs-on: ubuntu-latest
needs: changes
if: needs.changes.outputs.codechange == 'true'

timeout-minutes: 30
concurrency:
group: ${{ github.workflow }}-singlestore-dockerized-tests-${{ github.event.pull_request.number }}
group: ${{ github.workflow }}-singlestore-dockerized-tests-${{ github.event.pull_request.number }}-${{ matrix.java }}
cancel-in-progress: true
steps:
- uses: actions/checkout@v4
Expand All @@ -56,7 +59,7 @@ jobs:
- uses: actions/setup-java@v2
with:
distribution: 'temurin'
java-version: 17
java-version: ${{ matrix.java }}
- name: Cache local Maven repository
id: cache-maven
uses: actions/cache@v2
Expand Down
7 changes: 5 additions & 2 deletions .github/workflows/spark-integration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,12 +30,15 @@ jobs:
codechange:
- '!presto-docs/**'
spark-integration:
strategy:
matrix:
java: [ 8, 17 ]
runs-on: ubuntu-latest
needs: changes
if: needs.changes.outputs.codechange == 'true'
timeout-minutes: 60
concurrency:
group: ${{ github.workflow }}-spark-integration-${{ github.event.pull_request.number }}
group: ${{ github.workflow }}-spark-integration-${{ github.event.pull_request.number }}-${{ matrix.java }}
cancel-in-progress: true
steps:
- uses: actions/checkout@v4
Expand All @@ -44,7 +47,7 @@ jobs:
- uses: actions/setup-java@v2
with:
distribution: 'temurin'
java-version: 17
java-version: ${{ matrix.java }}
- name: Cache local Maven repository
id: cache-maven
uses: actions/cache@v2
Expand Down
7 changes: 5 additions & 2 deletions .github/workflows/test-other-modules.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,12 +30,15 @@ jobs:
codechange:
- '!presto-docs/**'
test-other-modules:
strategy:
matrix:
java: [ 8, 17 ]
runs-on: ubuntu-latest
needs: changes
if: needs.changes.outputs.codechange == 'true'
timeout-minutes: 60
concurrency:
group: ${{ github.workflow }}-test-other-modules-${{ github.event.pull_request.number }}
group: ${{ github.workflow }}-test-other-modules-${{ github.event.pull_request.number }}-${{ matrix.java }}
cancel-in-progress: true
steps:
- uses: actions/checkout@v4
Expand All @@ -44,7 +47,7 @@ jobs:
- uses: actions/setup-java@v2
with:
distribution: 'temurin'
java-version: 17
java-version: ${{ matrix.java }}
- name: Cache local Maven repository
id: cache-maven
uses: actions/cache@v2
Expand Down
5 changes: 3 additions & 2 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ jobs:
strategy:
fail-fast: false
matrix:
java: [8, 17]
modules:
- ":presto-tests -P presto-tests-execution-memory"
- ":presto-tests -P presto-tests-general"
Expand Down Expand Up @@ -68,7 +69,7 @@ jobs:
- ":presto-iceberg"
timeout-minutes: 80
concurrency:
group: ${{ github.workflow }}-test-${{ matrix.modules }}-${{ github.event.pull_request.number }}
group: ${{ github.workflow }}-test-${{ matrix.modules }}-${{ github.event.pull_request.number }}-${{ matrix.java }}
cancel-in-progress: true
steps:
- uses: actions/checkout@v4
Expand All @@ -79,7 +80,7 @@ jobs:
if: needs.changes.outputs.codechange == 'true'
with:
distribution: 'temurin'
java-version: 17
java-version: ${{ matrix.java }}
- name: Cache local Maven repository
if: needs.changes.outputs.codechange == 'true'
id: cache-maven
Expand Down

0 comments on commit 6b1917b

Please sign in to comment.