From d715ce18bf875d1c954d3c9ff0bf84dca5a45354 Mon Sep 17 00:00:00 2001 From: Tim Meusel Date: Tue, 26 Mar 2024 18:01:40 +0100 Subject: [PATCH] (#9302) Add Ruby 3.3 to CI matrix --- .github/workflows/rspec_tests.yaml | 2 ++ Gemfile | 2 +- spec/unit/x509/cert_provider_spec.rb | 4 ++-- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.github/workflows/rspec_tests.yaml b/.github/workflows/rspec_tests.yaml index 72f722918f1..dfe18eabab4 100644 --- a/.github/workflows/rspec_tests.yaml +++ b/.github/workflows/rspec_tests.yaml @@ -19,9 +19,11 @@ jobs: - {os: ubuntu-latest, ruby: '3.1'} - {os: ubuntu-20.04, ruby: '3.2'} # openssl 1.1.1 - {os: ubuntu-22.04, ruby: '3.2'} # openssl 3 + - {os: ubuntu-22.04, ruby: '3.3'} # openssl 3 / latest Ruby - {os: ubuntu-latest, ruby: 'jruby-9.4.3.0'} - {os: windows-2019, ruby: '3.1'} - {os: windows-2019, ruby: '3.2'} # openssl 3 + - {os: windows-2019, ruby: '3.3'} # openssl 3 / latest Ruby runs-on: ${{ matrix.cfg.os }} env: diff --git a/Gemfile b/Gemfile index ba712e6f6bb..a2c7e5fe43b 100644 --- a/Gemfile +++ b/Gemfile @@ -62,7 +62,7 @@ end group(:development, optional: true) do gem 'memory_profiler', require: false, platforms: [:mri] gem 'pry', require: false, platforms: [:ruby] - gem "racc", "1.5.2", require: false, platforms: [:ruby] + gem "racc", "1.5.2", require: false if RUBY_PLATFORM != 'java' gem 'ruby-prof', '>= 0.16.0', require: false end diff --git a/spec/unit/x509/cert_provider_spec.rb b/spec/unit/x509/cert_provider_spec.rb index 7ad2dea0eb5..dcb51aa9c68 100644 --- a/spec/unit/x509/cert_provider_spec.rb +++ b/spec/unit/x509/cert_provider_spec.rb @@ -280,7 +280,7 @@ def expects_private_file(path) # password is 74695716c8b6 expect { provider.load_private_key('encrypted-key') - }.to raise_error(OpenSSL::PKey::PKeyError, /Could not parse PKey: (no start line|bad decrypt)/) + }.to raise_error(OpenSSL::PKey::PKeyError, /Could not parse PKey/) end it 'decrypts an RSA key previously saved using 3DES' do @@ -315,7 +315,7 @@ def expects_private_file(path) # password is 74695716c8b6 expect { provider.load_private_key('encrypted-ec-key') - }.to raise_error(OpenSSL::PKey::PKeyError, /(unknown|invalid) curve name|Could not parse PKey: (no start line|bad decrypt)/) + }.to raise_error(OpenSSL::PKey::PKeyError, /(unknown|invalid) curve name|Could not parse PKey/) end end end