update CI matrix (#65)

update to 3.4.3, add 4.0.0.M2 in addition to snapshot, and simplify the
java 11/17 logic (always use 11 for 3.4.x, 17 for 4.x)

Signed-off-by: Cody Cutrer <[email protected]>

Author: ccutrer

.github/workflows/ci.yml

@@ -70,9 +70,7 @@ jobs:
     if: "!contains(github.event.head_commit.message, 'ci skip')"
     outputs:
       openhab_matrix: |
-        ["3.4.2", "4.0.0-SNAPSHOT"]
-      java_matrix: |
-        ["11", "17"]
+        ["3.4.3", "4.0.0.M2", "4.0.0-SNAPSHOT"]
       snapshot_date: |
         ${{ steps.snapshot-date.outputs.SNAPSHOT_DATE }}
     steps:
@@ -104,7 +102,7 @@ jobs:
       - uses: actions/setup-java@v3
         with:
           distribution: zulu
-          java-version: ${{ endsWith(matrix.openhab_version, 'SNAPSHOT') && '17' || '11' }}
+          java-version: ${{ startsWith(matrix.openhab_version, '4.') && '17' || '11' }}
           java-package: jre
       - name: Setup openHAB
         if: steps.cache.outputs.cache-hit != 'true'
@@ -128,15 +126,12 @@ jobs:
     strategy:
       matrix:
         openhab_version: ${{ fromJson(needs.openhab-matrix.outputs.openhab_matrix) }}
-        java_version:  ${{ fromJson(needs.openhab-matrix.outputs.java_matrix) }}
         jruby_version: ["jruby-9.3.10.0", "jruby-9.4.2.0"]
         exclude:
-          - openhab_version: 3.4.0
-            java_version: 17
+          - openhab_version: 4.0.0.M2
+            jruby_version: jruby-9.3.10.0
           - openhab_version: 4.0.0-SNAPSHOT
-            java_version: 11
-          - openhab_version: 4.0.0-SNAPSHOT
-            jruby_version: "jruby-9.3.10.0"
+            jruby_version: jruby-9.3.10.0
     steps:
       - uses: actions/checkout@v3
       - uses: ruby/setup-ruby@v1
@@ -146,7 +141,7 @@ jobs:
       - uses: actions/setup-java@v3
         with:
           distribution: zulu
-          java-version: ${{ matrix.java_version }}
+          java-version: ${{ startsWith(matrix.openhab_version, '4.') && '17' || '11' }}
           java-package: jre
       - name: Restore openHAB setup
         uses: actions/cache@v3
@@ -167,7 +162,7 @@ jobs:
         uses: actions/upload-artifact@v3
         if: success() || failure()
         with:
-          name: RSpec-results-openHAB-${{ matrix.openhab_version }}-jruby-${{ matrix.jruby_version }}-java-${{ matrix.java_version }}
+          name: RSpec-results-openHAB-${{ matrix.openhab_version }}-jruby-${{ matrix.jruby_version }}
           path: rspec.html
 
   cucumber:
@@ -177,12 +172,6 @@ jobs:
     strategy:
       matrix:
         openhab_version: ${{ fromJson(needs.openhab-matrix.outputs.openhab_matrix) }}
-        java_version:  ${{ fromJson(needs.openhab-matrix.outputs.java_matrix) }}
-        exclude:
-          - openhab_version: 3.4.1
-            java_version: 17
-          - openhab_version: 4.0.0-SNAPSHOT
-            java_version: 11
     steps:
       - uses: actions/checkout@v3
       - uses: ruby/setup-ruby@v1
@@ -192,7 +181,7 @@ jobs:
       - uses: actions/setup-java@v3
         with:
           distribution: zulu
-          java-version: ${{ matrix.java_version }}
+          java-version: ${{ startsWith(matrix.openhab_version, '4.') && '17' || '11' }}
           java-package: jre
       - name: Restore openHAB setup
         uses: actions/cache@v3
@@ -206,7 +195,7 @@ jobs:
         uses: actions/upload-artifact@v3
         if: success() || failure()
         with:
-          name: Cucumber-logs-openHAB-${{ matrix.openhab_version }}-java-${{ matrix.java_version }}
+          name: Cucumber-logs-openHAB-${{ matrix.openhab_version }}
           path: |
             tmp/openhab/userdata/logs
             tmp/karaf.log