From 3f81b4af0ccda9ed1cef0e759cec117c7c44faee Mon Sep 17 00:00:00 2001 From: Tim Meusel Date: Fri, 13 Jun 2025 23:56:39 +0200 Subject: [PATCH 1/6] CI: Test jruby-9.4.3 We have some weird JRuby issues on main. Previously we pinned to JRuby-9.4 on Ubuntu-24.04. That currently gives us https://github.com/ruby/ruby-builder/releases/download/toolcache/jruby-9.4.13.0-ubuntu-24.04.tar.gz The old Perforce CI was pinned to jruby-9.4.3.0 on Ubuntu 22.04, lets try that. --- .github/workflows/tests.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml index 99cf1a0efd..d8024d3948 100644 --- a/.github/workflows/tests.yaml +++ b/.github/workflows/tests.yaml @@ -45,7 +45,7 @@ jobs: - {os: ubuntu-24.04, ruby: '3.2'} # openssl 3 - {os: ubuntu-24.04, ruby: '3.3'} # openssl 3 - {os: ubuntu-24.04, ruby: '3.4'} # openssl 3 - - {os: ubuntu-24.04, ruby: 'jruby-9.4'} + - {os: ubuntu-22.04, ruby: 'jruby-9.4.3'} - {os: windows-2025, ruby: '3.1'} - {os: windows-2025, ruby: '3.2'} # openssl 3 - {os: windows-2025, ruby: '3.3'} # openssl 3 From 64cf55a76a634a7823e5f8b3090e68667b9c87f9 Mon Sep 17 00:00:00 2001 From: Tim Meusel Date: Sat, 14 Jun 2025 19:57:02 +0200 Subject: [PATCH 2/6] Test more jruby versions --- .github/workflows/tests.yaml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml index d8024d3948..69e0cdb482 100644 --- a/.github/workflows/tests.yaml +++ b/.github/workflows/tests.yaml @@ -45,7 +45,9 @@ jobs: - {os: ubuntu-24.04, ruby: '3.2'} # openssl 3 - {os: ubuntu-24.04, ruby: '3.3'} # openssl 3 - {os: ubuntu-24.04, ruby: '3.4'} # openssl 3 - - {os: ubuntu-22.04, ruby: 'jruby-9.4.3'} + - {os: ubuntu-22.04, ruby: 'jruby-9.4.3'} # what Perforce used in their CI + - {os: ubuntu-22.04, ruby: 'jruby-9.4.8' } # what Openvox packages + - {os: ubuntu-22.04, ruby: 'jruby-9.4.13' } # latest - {os: windows-2025, ruby: '3.1'} - {os: windows-2025, ruby: '3.2'} # openssl 3 - {os: windows-2025, ruby: '3.3'} # openssl 3 From 1e797328dc14e81120f231db932426b104867918 Mon Sep 17 00:00:00 2001 From: Tim Meusel Date: Sat, 14 Jun 2025 20:29:13 +0200 Subject: [PATCH 3/6] Test on even more jruy versions --- .github/workflows/tests.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml index 69e0cdb482..b1a1f85999 100644 --- a/.github/workflows/tests.yaml +++ b/.github/workflows/tests.yaml @@ -46,6 +46,10 @@ jobs: - {os: ubuntu-24.04, ruby: '3.3'} # openssl 3 - {os: ubuntu-24.04, ruby: '3.4'} # openssl 3 - {os: ubuntu-22.04, ruby: 'jruby-9.4.3'} # what Perforce used in their CI + - {os: ubuntu-22.04, ruby: 'jruby-9.4.4'} + - {os: ubuntu-22.04, ruby: 'jruby-9.4.5'} + - {os: ubuntu-22.04, ruby: 'jruby-9.4.6'} + - {os: ubuntu-22.04, ruby: 'jruby-9.4.7'} - {os: ubuntu-22.04, ruby: 'jruby-9.4.8' } # what Openvox packages - {os: ubuntu-22.04, ruby: 'jruby-9.4.13' } # latest - {os: windows-2025, ruby: '3.1'} From c6826fdef896a6917cd05cf34734c7e3465fa81c Mon Sep 17 00:00:00 2001 From: Tim Meusel Date: Thu, 19 Jun 2025 01:20:54 +0200 Subject: [PATCH 4/6] webmock: Pin to < 3.25 --- Gemfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile b/Gemfile index 192418d7b9..10cd332f3d 100644 --- a/Gemfile +++ b/Gemfile @@ -49,7 +49,7 @@ group(:test) do gem "rspec-its", "~> 1.1", require: false gem 'rspec-mocks', '< 3.13.3', require: false # breaking change afterwards: https://github.com/rspec/rspec-mocks/pull/1596 gem 'vcr', '~> 6.1', require: false - gem 'webmock', '~> 3.0', require: false + gem 'webmock', '~> 3.0', '< 3.25', require: false gem 'webrick', '~> 1.7', require: false gem 'yard', require: false From 65af7cfbeb3256d5409abc7c40dfa2b6f17ad5f0 Mon Sep 17 00:00:00 2001 From: Tim Meusel Date: Sun, 27 Jul 2025 12:42:50 +0200 Subject: [PATCH 5/6] Pin multi_json to < 1.16 --- openvox.gemspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openvox.gemspec b/openvox.gemspec index 333476ba32..ab0ed7ad4f 100644 --- a/openvox.gemspec +++ b/openvox.gemspec @@ -27,7 +27,7 @@ Gem::Specification.new do |spec| spec.add_runtime_dependency('fast_gettext', '>= 2.1', '< 4') spec.add_runtime_dependency('getoptlong', '~> 0.2.0') spec.add_runtime_dependency('locale', '~> 2.1') - spec.add_runtime_dependency('multi_json', '~> 1.13') + spec.add_runtime_dependency('multi_json', '~> 1.13', '< 1.16') # 1.15 is what perforce used spec.add_runtime_dependency('openfact', '~> 5.0') spec.add_runtime_dependency('ostruct', '~> 0.6.0') spec.add_runtime_dependency('puppet-resource_api', '~> 1.5') From 94b879a9e033845409fd5597fd116c49e267b3e2 Mon Sep 17 00:00:00 2001 From: Tim Meusel Date: Sun, 27 Jul 2025 13:15:33 +0200 Subject: [PATCH 6/6] json: pin to 2.7.6 --- Gemfile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Gemfile b/Gemfile index 10cd332f3d..57bf946c0a 100644 --- a/Gemfile +++ b/Gemfile @@ -88,4 +88,6 @@ if File.exist? "#{__FILE__}.local" eval(File.read("#{__FILE__}.local"), binding) end +gem 'json', '2.7.6' # last release used by Perforce + # vim:filetype=ruby