Skip to content

Commit

Permalink
CI against 3.4.5 and 4.0.1 to use latest java ver (#100)
Browse files Browse the repository at this point in the history
  • Loading branch information
jimtng authored Aug 6, 2023
1 parent 7c7e0f3 commit 11fbc0f
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ jobs:
if: "!contains(github.event.head_commit.message, 'ci skip')"
outputs:
openhab_matrix: |
["3.4.3", "4.0.0", "4.1.0-SNAPSHOT"]
["3.4.5", "4.0.1", "4.1.0-SNAPSHOT"]
snapshot_date: |
${{ steps.snapshot-date.outputs.SNAPSHOT_DATE }}
steps:
Expand Down Expand Up @@ -128,7 +128,7 @@ jobs:
openhab_version: ${{ fromJson(needs.openhab-matrix.outputs.openhab_matrix) }}
jruby_version: ["jruby-9.3.10.0", "jruby-9.4.3.0"]
exclude:
- openhab_version: 4.0.0
- openhab_version: 4.0.1
jruby_version: jruby-9.3.10.0
- openhab_version: 4.1.0-SNAPSHOT
jruby_version: jruby-9.3.10.0
Expand All @@ -141,7 +141,7 @@ jobs:
- uses: actions/setup-java@v3
with:
distribution: zulu
java-version: ${{ startsWith(matrix.openhab_version, '4.') && '17.0.7' || '11.0.19' }}
java-version: ${{ startsWith(matrix.openhab_version, '4.') && '17' || '11' }}
java-package: jre
- name: Restore openHAB setup
uses: actions/cache@v3
Expand Down Expand Up @@ -181,7 +181,7 @@ jobs:
- uses: actions/setup-java@v3
with:
distribution: zulu
java-version: ${{ startsWith(matrix.openhab_version, '4.') && '17.0.7' || '11.0.9' }}
java-version: ${{ startsWith(matrix.openhab_version, '4.') && '17' || '11' }}
java-package: jre
- name: Restore openHAB setup
uses: actions/cache@v3
Expand Down
2 changes: 1 addition & 1 deletion bin/rspec
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/usr/bin/env jruby
#!/usr/bin/env -S jruby -J-Djdk.util.zip.disableZip64ExtraFieldValidation=true
# frozen_string_literal: true

#
Expand Down

0 comments on commit 11fbc0f

Please sign in to comment.