diff --git a/.github/workflows/test-integration-unreleased.yml b/.github/workflows/test-integration-unreleased.yml index 2c0d59a450..651231a894 100644 --- a/.github/workflows/test-integration-unreleased.yml +++ b/.github/workflows/test-integration-unreleased.yml @@ -16,10 +16,12 @@ jobs: matrix: entry: - { opensearch_ref: '1.x', java: 11 } - - { opensearch_ref: '2.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: 17 } - { opensearch_ref: '2.x', java: 21 } - - { opensearch_ref: 'main', java: 11 } + # 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: 17 } - { opensearch_ref: 'main', java: 21 } steps: @@ -48,10 +50,22 @@ 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 + uses: actions/setup-java@v4 + with: + java-version: ${{ matrix.entry.gradle-runtime }} + distribution: temurin + + - name: Set JAVA${{ matrix.java }}_HOME + shell: bash + run: | + echo "JAVA${{ matrix.java }}_HOME=$JAVA_HOME_${{ matrix.java }}_${{ runner.arch }}" >> $GITHUB_ENV + - name: Assemble OpenSearch if: steps.cache-restore.outputs.cache-hit != 'true' working-directory: opensearch - run: ./gradlew :distribution:archives:linux-tar:assemble + run: ./gradlew :distribution:archives:linux-tar:assemble -Druntime.java=${{ matrix.java }} - name: Save cached build if: steps.cache-restore.outputs.cache-hit != 'true' diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 2c3521197d..a4b76b9530 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index d51870384b..176d08d230 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -28,7 +28,7 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.10-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionSha256Sum=d725d707bfabd4dfdc958c624003b3c80accc03f7037b5122c4b1d0ef15cecab +distributionSha256Sum=5b9c5eb3f9fc2c94abaea57d90bd78747ca117ddbbf96c859d3741181a12bf2a