Use Oracle setup-java action to setup Java EA for testing

flowable · Jan 31, 2024 · c83638d · c83638d
1 parent aac7742
commit c83638d
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 326 deletions.
diff --git a/.github/actions/scripts/install-jdk.sh b/.github/actions/scripts/install-jdk.sh
diff --git a/.github/workflows/java-ea.yml b/.github/workflows/java-ea.yml
@@ -23,15 +23,14 @@ jobs:
           path: ~/.m2
           key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
           restore-keys: ${{ runner.os }}-m2
+      - name: 'Set up JDK'
+        uses: oracle-actions/setup-java@v1
+        with:
+          website: jdk.java.net
+          release: EA
       - name: Install
-        # If installing the JDK is in a different step then wrong java would be used
         # Need to do install first in order for the OSGi tests to work
-        run: |
-          . ./.github/actions/scripts/install-jdk.sh --feature ea --os linux-x64
-          ./mvnw install ${MAVEN_ARGS} -DskipTests=true -Dmaven.javadoc.skip=true -B -V
+        run: ./mvnw install ${MAVEN_ARGS} -DskipTests=true -Dmaven.javadoc.skip=true -B -V
       - name: Test
-        # If installing the JDK is in a different step then wrong java would be used
-        run: |
-          . ./.github/actions/scripts/install-jdk.sh --feature ea --os linux-x64
-          ./mvnw verify -Pdistro,errorLogging ${MAVEN_ARGS} -Dmaven.test.redirectTestOutputToFile=false
+        run: ./mvnw verify -Pdistro,errorLogging ${MAVEN_ARGS} -Dmaven.test.redirectTestOutputToFile=false
         continue-on-error: true