From f9f154d74eebfdc2f2a790bab14b5994c0dca47b Mon Sep 17 00:00:00 2001 From: Andriy Redko Date: Mon, 19 Aug 2024 08:47:17 -0400 Subject: [PATCH] Fix Github Action workflow Signed-off-by: Andriy Redko --- .github/workflows/test-integration-unreleased.yml | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/.github/workflows/test-integration-unreleased.yml b/.github/workflows/test-integration-unreleased.yml index 651231a894..eda29e28e2 100644 --- a/.github/workflows/test-integration-unreleased.yml +++ b/.github/workflows/test-integration-unreleased.yml @@ -16,12 +16,10 @@ jobs: matrix: entry: - { opensearch_ref: '1.x', java: 11 } - # See please https://docs.gradle.org/8.10/userguide/upgrading_version_8.html#minimum_daemon_jvm_version - - { opensearch_ref: '2.x', java: 11, gradle-runtime: 17 } + - { opensearch_ref: '2.x', java: 11 } - { opensearch_ref: '2.x', java: 17 } - { opensearch_ref: '2.x', java: 21 } - # See please https://docs.gradle.org/8.10/userguide/upgrading_version_8.html#minimum_daemon_jvm_version - - { opensearch_ref: 'main', java: 11, gradle-runtime: 17 } + - { opensearch_ref: 'main', java: 11 } - { opensearch_ref: 'main', java: 17 } - { opensearch_ref: 'main', java: 21 } steps: @@ -50,11 +48,12 @@ jobs: path: opensearch/distribution/archives/linux-tar/build/distributions key: ${{ steps.get-key.outputs.key }} - - name: Set up Gradle JDK runtime - if: matrix.entry.gradle-runtime + - name: Set up JDK 17 + # See please https://docs.gradle.org/8.10/userguide/upgrading_version_8.html#minimum_daemon_jvm_version + if: matrix.java == 11 uses: actions/setup-java@v4 with: - java-version: ${{ matrix.entry.gradle-runtime }} + java-version: 17 distribution: temurin - name: Set JAVA${{ matrix.java }}_HOME