Address code review comments

Signed-off-by: Andriy Redko <[email protected]>
opensearch-project · Aug 14, 2024 · efc42ca · efc42ca
1 parent 958c4fb
commit efc42ca
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 27 deletions.
diff --git a/.github/workflows/assemble.yml b/.github/workflows/assemble.yml
@@ -23,12 +23,10 @@ jobs:
         with:
           java-version: 17
           distribution: temurin
-      - name: Set JAVA11_HOME
-        # See please https://docs.gradle.org/8.10/userguide/upgrading_version_8.html#minimum_daemon_jvm_version
-        if: matrix.java == 11
+      - name: Set JAVA${{ matrix.java }}_HOME
         shell: bash
         run: |
-          echo "JAVA11_HOME=$JAVA_HOME_11_${{ runner.arch }}" >> $GITHUB_ENV
+          echo "JAVA${{ matrix.java }}_HOME=$JAVA_HOME_${{ matrix.java }}_${{ runner.arch }}" >> $GITHUB_ENV
       - name: Setup docker (missing on MacOS)
         id: setup_docker
         if: runner.os == 'macos'
@@ -42,20 +40,12 @@ jobs:
         run: |
           # Report success even if previous step failed (Docker on MacOS runner is very unstable)
           exit 0;
-      - name: Run Gradle (assemble)
-        if: runner.os != 'macos' && matrix.java != 11
-        run: |
-          ./gradlew assemble --parallel --no-build-cache -PDISABLE_BUILD_CACHE 
       - name: Run Gradle (assemble)
         shell: bash
-        if: runner.os != 'macos' && matrix.java == 11
-        run: |
-          ./gradlew assemble --parallel --no-build-cache -PDISABLE_BUILD_CACHE -Druntime.java=11
-      - name: Run Gradle (assemble)
-        if: runner.os == 'macos' && steps.setup_docker.outcome == 'success' && matrix.java == 11
+        if: runner.os != 'macos'
         run: |
-          ./gradlew assemble --parallel --no-build-cache -PDISABLE_BUILD_CACHE -Druntime.java=11
+          ./gradlew assemble --parallel --no-build-cache -PDISABLE_BUILD_CACHE -Druntime.java=${{ matrix.java }} 
       - name: Run Gradle (assemble)
-        if: runner.os == 'macos' && steps.setup_docker.outcome == 'success' && matrix.java != 11
+        if: runner.os == 'macos' && steps.setup_docker.outcome == 'success'
         run: |
-          ./gradlew assemble --parallel --no-build-cache -PDISABLE_BUILD_CACHE
+          ./gradlew assemble --parallel --no-build-cache -PDISABLE_BUILD_CACHE -Druntime.java=${{ matrix.java }}
diff --git a/.github/workflows/precommit.yml b/.github/workflows/precommit.yml
@@ -24,19 +24,11 @@ jobs:
         with:
           java-version: 17
           distribution: temurin
-      - name: Set JAVA11_HOME
-        # See please https://docs.gradle.org/8.10/userguide/upgrading_version_8.html#minimum_daemon_jvm_version
-        if: matrix.java == 11
+      - name: Set JAVA${{ matrix.java }}_HOME
         shell: bash
         run: |
-          echo "JAVA11_HOME=$JAVA_HOME_11_${{ runner.arch }}" >> $GITHUB_ENV
+          echo "JAVA${{ matrix.java }}_HOME=$JAVA_HOME_${{ matrix.java }}_${{ runner.arch }}" >> $GITHUB_ENV
       - name: Run Gradle (precommit)
-        # See please https://docs.gradle.org/8.10-rc-1/userguide/upgrading_version_8.html#minimum_daemon_jvm_version
-        if: matrix.java == 11
         shell: bash
         run: |
-          ./gradlew javadoc precommit --parallel -Druntime.java=11
-      - name: Run Gradle (precommit)
-        if: matrix.java != 11
-        run: |
-          ./gradlew javadoc precommit --parallel
+          ./gradlew javadoc precommit --parallel -Druntime.java=${{ matrix.java }}
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar