Skip to content

Commit

Permalink
Test against jruby 9.4.3.0 (#86)
Browse files Browse the repository at this point in the history
* Test against java 11.0.19
* Disable java's zip validation in openhab test env
* Set java options for rspec

Signed-off-by: Jimmy Tanagra <jcode@tanagra.id.au>
  • Loading branch information
jimtng authored Jul 21, 2023
1 parent eb406c8 commit ab85a61
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 3 deletions.
6 changes: 4 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ jobs:
strategy:
matrix:
openhab_version: ${{ fromJson(needs.openhab-matrix.outputs.openhab_matrix) }}
jruby_version: ["jruby-9.3.10.0", "jruby-9.4.2.0"]
jruby_version: ["jruby-9.3.10.0", "jruby-9.4.3.0"]
exclude:
- openhab_version: 4.0.0.M3
jruby_version: jruby-9.3.10.0
Expand All @@ -141,13 +141,15 @@ jobs:
- uses: actions/setup-java@v3
with:
distribution: zulu
java-version: ${{ startsWith(matrix.openhab_version, '4.') && '17' || '11' }}
java-version: ${{ startsWith(matrix.openhab_version, '4.') && '17' || '11.0.19+7' }}
java-package: jre
- name: Restore openHAB setup
uses: actions/cache@v3
with:
path: tmp/
key: openHAB-setup-${{ matrix.openhab_version }}${{ endsWith(matrix.openhab_version, 'SNAPSHOT') && needs.openhab-matrix.outputs.snapshot_date || '' }}
- name: Set Java options
run: echo "EXTRA_JAVA_OPTS=-Djdk.util.zip.disableZip64ExtraFieldValidation=true" >> $GITHUB_ENV
- name: RSpec
run: bin/rspec --format progress --format html --out rspec.html
timeout-minutes: 6
Expand Down
2 changes: 1 addition & 1 deletion rakelib/openhab.rake
Original file line number Diff line number Diff line change
Expand Up @@ -255,7 +255,7 @@ namespace :openhab do
"LANG" => ENV.fetch("LANG", nil),
"JAVA_HOME" => ENV.fetch("JAVA_HOME", nil),
"KARAF_REDIRECT" => karaf_log,
"EXTRA_JAVA_OPTS" => "-Xmx4g",
"EXTRA_JAVA_OPTS" => "-Xmx4g -Djdk.util.zip.disableZip64ExtraFieldValidation=true",
"OPENHAB_HTTP_PORT" => ENV["OPENHAB_HTTP_PORT"] || "8080",
"OPENHAB_HTTPS_PORT" => ENV["OPENHAB_HTTPS_PORT"] || "8443"
}
Expand Down

0 comments on commit ab85a61

Please sign in to comment.