fix main GHA java defaults

lucee · Jul 21, 2022 · e278054 · e278054
1 parent 0c2ad76
commit e278054
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 4 deletions.
diff --git a/.github/workflows/main-java-8.yml b/.github/workflows/main-java-8.yml
@@ -1,4 +1,4 @@
-name: Test with Java 8
+name: Build with Java 8
 
 on: [workflow_dispatch]
 

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -9,7 +9,7 @@ on:
       LUCEE_BUILD_JAVA_VERSION:
         required: true
         type: string
-        default: 8
+        default: '8'
   push: 
   pull_request:
   workflow_dispatch:
@@ -62,7 +62,7 @@ jobs:
       with:
         timezoneLinux: "UTC"
     - uses: actions/checkout@v2
-    - name: Set up Test Java Version
+    - name: Set up Test Java Version ${{ inputs.LUCEE_TEST_JAVA_VERSION }}
       uses: actions/setup-java@v2
       if: ${{ inputs.LUCEE_TEST_JAVA_VERSION != '' }}
       with:
@@ -73,9 +73,16 @@ jobs:
       run: echo "LUCEE_TEST_JAVA_EXEC=${{ env.JAVA_HOME }}/bin/java" >> $GITHUB_ENV
     - name: Set up JDK '${{ inputs.LUCEE_BUILD_JAVA_VERSION }}'
       uses: actions/setup-java@v2
+      if: ${{ inputs.LUCEE_TEST_JAVA_VERSION != '' }}
       with:
         java-version: '${{ inputs.LUCEE_BUILD_JAVA_VERSION }}'
         distribution: 'temurin'
+    - name: Set up JDK 8 (Lucee default)
+      uses: actions/setup-java@v2
+      if: ${{ inputs.LUCEE_TEST_JAVA_VERSION == '' }} && ${{ inputs.LUCEE_TEST_JAVA_VERSION != 8 }}
+      with:
+        java-version: '8'
+        distribution: 'temurin'
     - name: Cache Lucee extensions
       uses: actions/cache@v2
       with:

diff --git a/.github/workflows/test-java-18.yml b/.github/workflows/test-java-18.yml
@@ -1,4 +1,4 @@
-name: Test with Java 17
+name: Test with Java 18
 
 on: [workflow_dispatch]