From 6859a0f76f0b2b9cfb713319c470c7a4bf76908f Mon Sep 17 00:00:00 2001 From: Shaun McCormick Date: Tue, 2 Mar 2021 16:03:59 -0600 Subject: [PATCH] Add support for Ruby 3.0 --- .circleci/config.yml | 43 ++++++++++++++++++++++++++++++++++++++++-- CHANGELOG.md | 2 ++ gruf-lightstep.gemspec | 2 +- 3 files changed, 44 insertions(+), 3 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index df314d8..ab1398f 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -18,8 +18,19 @@ executors: parameters: ruby-version: type: string - default: "2.6.3" - + default: "2.6" + ruby_2_7: + <<: *ruby_env + parameters: + ruby-version: + type: string + default: "2.7" + ruby_3_0: + <<: *ruby_env + parameters: + ruby-version: + type: string + default: "3.0" commands: pre-setup: steps: @@ -27,6 +38,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" }} @@ -113,3 +130,25 @@ workflows: - rspec-unit: name: "ruby-2_6-rspec" e: "ruby_2_6" + ruby_2_7: + jobs: + - bundle-audit: + name: "ruby-2_7-bundle_audit" + e: "ruby_2_7" + - rubocop: + name: "ruby-2_7-rubocop" + e: "ruby_2_7" + - 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 index f4c4d41..1acf192 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,8 @@ Changelog for the gruf-lightstep gem. ### Pending Release +- Add official support for Ruby 3 + ### 1.4.0 - Ensure `error` span tag is always set when an exception is raised diff --git a/gruf-lightstep.gemspec b/gruf-lightstep.gemspec index 7dd049b..3aa78c9 100644 --- a/gruf-lightstep.gemspec +++ b/gruf-lightstep.gemspec @@ -32,7 +32,7 @@ Gem::Specification.new do |spec| spec.files = Dir['README.md', 'CHANGELOG.md', 'CODE_OF_CONDUCT.md', 'lib/**/*', 'gruf-lightstep.gemspec'] spec.require_paths = ['lib'] - spec.required_ruby_version = '~> 2.6' + spec.required_ruby_version = '>= 2.6' spec.add_development_dependency 'bundler', '~> 1.11' spec.add_development_dependency 'bundler-audit', '~> 0.6'