From c41d347462fd8c2383dbc0517f0c254e8d161ad3 Mon Sep 17 00:00:00 2001 From: Chris Sinjakli Date: Sun, 2 Jun 2024 15:29:58 +0100 Subject: [PATCH 1/7] Test JRuby official image again --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index c817cda5..12d055ec 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -56,7 +56,7 @@ workflows: # # We'll drop this version on our next major release anyway, as it's # out of security support. - - circleci/jruby:9.1 + - jruby:9.1 - jruby:9.2 - jruby:9.3 - jruby:9.4 From c91ea2abe6bb25a774a0d892756c075717172836 Mon Sep 17 00:00:00 2001 From: Chris Sinjakli Date: Sun, 2 Jun 2024 15:35:57 +0100 Subject: [PATCH 2/7] test --- .circleci/config.yml | 2 +- prometheus-client.gemspec | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 12d055ec..c817cda5 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -56,7 +56,7 @@ workflows: # # We'll drop this version on our next major release anyway, as it's # out of security support. - - jruby:9.1 + - circleci/jruby:9.1 - jruby:9.2 - jruby:9.3 - jruby:9.4 diff --git a/prometheus-client.gemspec b/prometheus-client.gemspec index a421f0ac..40748e77 100644 --- a/prometheus-client.gemspec +++ b/prometheus-client.gemspec @@ -16,6 +16,7 @@ Gem::Specification.new do |s| s.require_paths = ['lib'] s.add_dependency 'base64' + s.add_dependency 'bigdecimal' s.add_development_dependency 'benchmark-ips' s.add_development_dependency 'concurrent-ruby' From aba5de2563877425b5c210bc96c04ca548ac94ed Mon Sep 17 00:00:00 2001 From: Chris Sinjakli Date: Sun, 2 Jun 2024 15:50:56 +0100 Subject: [PATCH 3/7] test --- .circleci/config.yml | 2 +- prometheus-client.gemspec | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index c817cda5..a7e422ec 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -56,7 +56,7 @@ workflows: # # We'll drop this version on our next major release anyway, as it's # out of security support. - - circleci/jruby:9.1 + - jruby:9.1-alpine - jruby:9.2 - jruby:9.3 - jruby:9.4 diff --git a/prometheus-client.gemspec b/prometheus-client.gemspec index 40748e77..a421f0ac 100644 --- a/prometheus-client.gemspec +++ b/prometheus-client.gemspec @@ -16,7 +16,6 @@ Gem::Specification.new do |s| s.require_paths = ['lib'] s.add_dependency 'base64' - s.add_dependency 'bigdecimal' s.add_development_dependency 'benchmark-ips' s.add_development_dependency 'concurrent-ruby' From 06adfe04de0b3970ba7996f288654c489a235aa9 Mon Sep 17 00:00:00 2001 From: Chris Sinjakli Date: Sun, 2 Jun 2024 15:56:51 +0100 Subject: [PATCH 4/7] test --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index a7e422ec..c817cda5 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -56,7 +56,7 @@ workflows: # # We'll drop this version on our next major release anyway, as it's # out of security support. - - jruby:9.1-alpine + - circleci/jruby:9.1 - jruby:9.2 - jruby:9.3 - jruby:9.4 From 69d66b91748e4c440c4dbc6ffa0c7c9aca0cbc90 Mon Sep 17 00:00:00 2001 From: Chris Sinjakli Date: Sun, 2 Jun 2024 16:09:17 +0100 Subject: [PATCH 5/7] test --- .circleci/config.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index c817cda5..4d453a9e 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -26,6 +26,7 @@ jobs: running_very_old_ruby=$(ruby -e 'puts Gem::Version.new(RUBY_VERSION) < Gem::Version.new("2.6.0")') running_moderately_old_ruby=$(ruby -e 'puts Gem::Version.new(RUBY_VERSION) < Gem::Version.new("3.0.0")') if [[ "${running_very_old_ruby}" == "true" ]]; then + sudo apt update && sudo apt install build-essential gem update --system 3.3.26 elif [[ "${running_moderately_old_ruby}" == "true" ]]; then gem update --system 3.4.22 From b5a06067f338030549232aaccce92c11deca76cf Mon Sep 17 00:00:00 2001 From: Chris Sinjakli Date: Sun, 2 Jun 2024 16:19:40 +0100 Subject: [PATCH 6/7] test --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 4d453a9e..cf0dc4f0 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -26,7 +26,7 @@ jobs: running_very_old_ruby=$(ruby -e 'puts Gem::Version.new(RUBY_VERSION) < Gem::Version.new("2.6.0")') running_moderately_old_ruby=$(ruby -e 'puts Gem::Version.new(RUBY_VERSION) < Gem::Version.new("3.0.0")') if [[ "${running_very_old_ruby}" == "true" ]]; then - sudo apt update && sudo apt install build-essential + sudo apt update && sudo apt dist-upgrade && sudo apt install build-essential gem update --system 3.3.26 elif [[ "${running_moderately_old_ruby}" == "true" ]]; then gem update --system 3.4.22 From 30d826c52c01b0f8fe0cb391a3c6ad31a7f7a2cf Mon Sep 17 00:00:00 2001 From: Chris Sinjakli Date: Sun, 2 Jun 2024 16:24:05 +0100 Subject: [PATCH 7/7] test --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index cf0dc4f0..46c6561e 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -26,7 +26,7 @@ jobs: running_very_old_ruby=$(ruby -e 'puts Gem::Version.new(RUBY_VERSION) < Gem::Version.new("2.6.0")') running_moderately_old_ruby=$(ruby -e 'puts Gem::Version.new(RUBY_VERSION) < Gem::Version.new("3.0.0")') if [[ "${running_very_old_ruby}" == "true" ]]; then - sudo apt update && sudo apt dist-upgrade && sudo apt install build-essential + sudo apt update && sudo apt dist-upgrade && sudo apt install build-essential patch gem update --system 3.3.26 elif [[ "${running_moderately_old_ruby}" == "true" ]]; then gem update --system 3.4.22