diff options
| author | Dan Allen <dan.j.allen@gmail.com> | 2023-05-01 01:02:41 -0600 |
|---|---|---|
| committer | Dan Allen <dan.j.allen@gmail.com> | 2023-05-01 01:02:41 -0600 |
| commit | b995f81993397873424946839fe241517328e323 (patch) | |
| tree | 7d38f6772d369e15748bcd27a038edcbabd321e2 | |
| parent | 2ddb9fc0506b6fe7eb07f3c12dd246aaccae4e9f (diff) | |
upgrade JRuby in CI workflow
| -rw-r--r-- | .github/workflows/ci.yml | 8 | ||||
| -rw-r--r-- | CHANGELOG.adoc | 1 | ||||
| -rw-r--r-- | test/test_helper.rb | 2 |
3 files changed, 9 insertions, 2 deletions
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 0ec79e94..08c0bf58 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -23,7 +23,7 @@ jobs: strategy: matrix: os: [ubuntu-latest, windows-latest] - ruby: ['jruby-9.2.19.0', '2.3', '2.7', '3.0', '3.1'] + ruby: [jruby-9.4.2.0, '2.3', '2.7', '3.0', '3.1'] asciimath-version: [~] haml-version: [~] pygments-version: ['~> 2.3.0'] @@ -84,6 +84,12 @@ jobs: run: | echo 'BUNDLE_WITHOUT=docs' >> $GITHUB_ENV echo 'COVERAGE=true' >> $GITHUB_ENV + - name: Upgrade Java (JRuby for Windows) + if: matrix.os == 'windows-latest' + uses: actions/setup-java@v3 + with: + distribution: temurin + java-version: '17' - name: Install Ruby (uses cached dependencies for non-scheduled build) uses: ruby/setup-ruby@v1 with: diff --git a/CHANGELOG.adoc b/CHANGELOG.adoc index 84c444e1..53cf59ba 100644 --- a/CHANGELOG.adoc +++ b/CHANGELOG.adoc @@ -29,6 +29,7 @@ Compliance:: * Fix call order so use of an include file with invalid encoding continues to raise error when using Ruby >= 3.2.0 * Fix test assertion for fallback Rouge stylesheet to be compatible with Rouge 4.1 (#4406) (*@tmzullinger*) * Support `notitle` option on section as alternative to `untitled` to hide title (#4437) + * Update latest JRuby in CI workflow to 9.4.2.0 * Add support for Haml 6 to template converter (#4429) Bug Fixes:: diff --git a/test/test_helper.rb b/test/test_helper.rb index 5a630b12..3161dbbb 100644 --- a/test/test_helper.rb +++ b/test/test_helper.rb @@ -360,7 +360,7 @@ class Minitest::Test #if jruby? && (Gem::Version.new JRUBY_VERSION) < (Gem::Version.new '9.2.10.0') if jruby? begin - old_env, env = ENV.merge, (ENV.merge env) + env = (old_env = ENV.to_h).merge env env.each {|key, val| env.delete key if val.nil? } if env.value? nil ENV.replace env popen [cmd, *args, opts], &block |