Merge branch 'opensearch-project:main' into faster-node-close

opensearch-project · Mar 31, 2022 · b884e22 · b884e22
2 parents 7075ed5 + 978c71a
commit b884e22
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml
@@ -14,10 +14,10 @@ jobs:
 
     steps:
 
-    - name: Set up JDK 14
+    - name: Set up JDK
       uses: actions/setup-java@v1
       with:
-        java-version: 14.0.x
+        java-version: 11
 
     - name: Checkout security
       uses: actions/checkout@v2

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -12,13 +12,12 @@ jobs:
     strategy:
       fail-fast: true
       matrix:
-        jdk: [11, 14, 17]
+        jdk: [11, 17]
 
     steps:
 
     - name: Set up JDK for build and test
-      if: matrix.jdk != 17 
-      uses: actions/setup-java@v1
+      uses: actions/setup-java@v2
       with:
         distribution: temurin # Temurin is a distribution of adoptium
         java-version: ${{ matrix.jdk }}