Merge pull request #9 from bigcommerce/ruby3

Add Ruby 3.0 support
bigcommerce · Apr 15, 2021 · c2f8957 · c2f8957
2 parents db6b928 + b9131ce
commit c2f8957
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 4 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -18,13 +18,19 @@ executors:
     parameters:
       ruby-version:
         type: string
-        default: "2.6.6"
+        default: "2.6"
   ruby_2_7:
     <<: *ruby_env
     parameters:
       ruby-version:
         type: string
-        default: "2.7.1"
+        default: "2.7"
+  ruby_3_0:
+    <<: *ruby_env
+    parameters:
+      ruby-version:
+        type: string
+        default: "3.0"
 
 commands:
   pre-setup:
@@ -33,6 +39,12 @@ commands:
       - checkout
   bundle-install:
     steps:
+      - run:
+          name: "Install bundler 1.17.3"
+          command: |
+            echo 'export BUNDLER_VERSION=1.17.3' >> $BASH_ENV
+            source $BASH_ENV
+            gem install bundler:1.17.3
       - restore_cache:
           keys:
             - gem-cache-{{ arch }}-{{ .Branch }}-{{ checksum "Gemfile.lock" }}
@@ -130,3 +142,14 @@ workflows:
       - rspec-unit:
           name: "ruby-2_7-rspec"
           e: "ruby_2_7"
+  ruby_3_0:
+    jobs:
+      - bundle-audit:
+          name: "ruby-3_0-bundle_audit"
+          e: "ruby_3_0"
+      - rubocop:
+          name: "ruby-3_0-rubocop"
+          e: "ruby_3_0"
+      - rspec-unit:
+          name: "ruby-3_0-rspec"
+          e: "ruby_3_0"
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,8 @@ Changelog for the gruf-prometheus gem.
 
 ### Pending Release
 
+- Add Ruby 3 support
+
 ### 2.0.0
 
 - Add server interceptor for measuring counters/histograms for server metrics

diff --git a/gruf-prometheus.gemspec b/gruf-prometheus.gemspec
@@ -31,10 +31,10 @@ Gem::Specification.new do |spec|
 
   spec.files         = Dir['README.md', 'CHANGELOG.md', 'CODE_OF_CONDUCT.md', 'lib/**/*', 'gruf-prometheus.gemspec']
   spec.require_paths = ['lib']
-  spec.required_ruby_version = '>= 2.6'
+  spec.required_ruby_version = '>= 2.6', '< 3.1'
 
   # Runtime dependencies
-  spec.add_runtime_dependency 'bc-prometheus-ruby', '~> 0.3'
+  spec.add_runtime_dependency 'bc-prometheus-ruby', '>= 0.5.1'
   spec.add_runtime_dependency 'gruf', '>= 2.7'
 
   # Development dependencies