From d490be843eac27c521321104ccc5f78d4c500376 Mon Sep 17 00:00:00 2001 From: Jimmy Tanagra Date: Mon, 16 Dec 2024 11:40:50 +1000 Subject: [PATCH] Update CI to openHAB 5 Signed-off-by: Jimmy Tanagra --- .github/workflows/ci.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 08f214e76..a885d0db1 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -71,7 +71,7 @@ jobs: if: "!contains(github.event.head_commit.message, 'ci skip')" outputs: openhab_matrix: | - ["3.4.5", "4.0.4", "4.1.3", "4.2.3", "4.3.0.M5", "4.3.0-SNAPSHOT"] + ["3.4.5", "4.0.4", "4.1.3", "4.2.3", "4.3.0", "5.0.0-SNAPSHOT"] snapshot_date: | ${{ steps.snapshot-date.outputs.SNAPSHOT_DATE }} steps: @@ -103,7 +103,7 @@ jobs: - uses: actions/setup-java@v4 with: distribution: zulu - java-version: ${{ startsWith(matrix.openhab_version, '4.') && '17' || '11' }} + java-version: ${{ startsWith(matrix.openhab_version, '5.') && '21' || startsWith(matrix.openhab_version, '4.') && '17' || '11' }} java-package: jre - name: Setup openHAB if: steps.cache.outputs.cache-hit != 'true' @@ -135,9 +135,9 @@ jobs: jruby_version: jruby-9.3.10.0 - openhab_version: 4.2.3 jruby_version: jruby-9.3.10.0 - - openhab_version: 4.3.0.M5 + - openhab_version: 4.3.0 jruby_version: jruby-9.3.10.0 - - openhab_version: 4.3.0-SNAPSHOT + - openhab_version: 5.0.0-SNAPSHOT jruby_version: jruby-9.3.10.0 steps: - uses: actions/checkout@v4 @@ -148,7 +148,7 @@ jobs: - uses: actions/setup-java@v4 with: distribution: zulu - java-version: ${{ startsWith(matrix.openhab_version, '4.') && '17' || '11' }} + java-version: ${{ startsWith(matrix.openhab_version, '5.') && '21' || startsWith(matrix.openhab_version, '4.') && '17' || '11' }} java-package: jre - name: Restore openHAB setup uses: actions/cache@v4 @@ -191,7 +191,7 @@ jobs: - uses: actions/setup-java@v4 with: distribution: zulu - java-version: ${{ startsWith(matrix.openhab_version, '4.') && '17' || '11' }} + java-version: ${{ startsWith(matrix.openhab_version, '5.') && '21' || startsWith(matrix.openhab_version, '4.') && '17' || '11' }} java-package: jre - name: Restore openHAB setup uses: actions/cache@v4