From 74646e2bbd0e89d1d498f7a44276f85e18953c6c Mon Sep 17 00:00:00 2001 From: Andrew Konchin Date: Mon, 8 Jan 2024 15:57:46 +0200 Subject: [PATCH 1/2] Use TruffleRuby 23.1.1 (latest) on CI --- .github/workflows/test.yml | 2 +- docker-compose.yml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index b035e809..3e43bdda 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -26,7 +26,7 @@ jobs: - "3.2" - "jruby-9.3" - "jruby-9.4" - - "truffleruby-22" + - "truffleruby-23" steps: - uses: actions/checkout@v2 - name: Run tests with Ruby ${{ matrix.ruby }} diff --git a/docker-compose.yml b/docker-compose.yml index 6ada67bf..36842246 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -95,8 +95,8 @@ services: working_dir: /code # https://github.com/flavorjones/truffleruby/pkgs/container/truffleruby - ci-truffleruby-22: - image: ghcr.io/flavorjones/truffleruby:22.3.1 + ci-truffleruby-23: + image: ghcr.io/flavorjones/truffleruby:23.1.1 entrypoint: /code/ci-run.sh environment: INTEGRATION: openldap From d15c58fc0a1444fd79a31ac812f0398245db2b91 Mon Sep 17 00:00:00 2001 From: Andrew Konchin Date: Mon, 8 Jan 2024 15:58:21 +0200 Subject: [PATCH 2/2] Remove excessive conditions in tests --- test/test_ssl_ber.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/test_ssl_ber.rb b/test/test_ssl_ber.rb index 766c8b84..cbcf1127 100644 --- a/test/test_ssl_ber.rb +++ b/test/test_ssl_ber.rb @@ -31,14 +31,14 @@ def setup def test_transmit_strings omit_if RUBY_PLATFORM == "java", "JRuby throws an error without a real socket" - omit_if (RUBY_VERSION >= "3.1" || RUBY_ENGINE == "truffleruby"), "Ruby complains about connection not being open" + omit_if RUBY_VERSION >= "3.1", "Ruby complains about connection not being open" assert_equal "foo", transmit("foo") end def test_transmit_ber_encoded_numbers omit_if RUBY_PLATFORM == "java", "JRuby throws an error without a real socket" - omit_if (RUBY_VERSION >= "3.1" || RUBY_ENGINE == "truffleruby"), "Ruby complains about connection not being open" + omit_if RUBY_VERSION >= "3.1", "Ruby complains about connection not being open" @to.write 1234.to_ber assert_equal 1234, @from.read_ber