Skip to content

Commit

Permalink
Increase minimum Ruby version to 3.0
Browse files Browse the repository at this point in the history
Signed-off-by: Ferenc Géczi <[email protected]>
  • Loading branch information
Ferenc- committed Feb 26, 2024
1 parent 3eeac30 commit c563ed0
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 64 deletions.
67 changes: 4 additions & 63 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,43 +40,6 @@ library_gemfile: &library_gemfile
- "./gemfiles/mongo_216.gemfile"
- "./gemfiles/mongo_219.gemfile"
executors:
ruby_27:
docker:
- image: cimg/ruby:2.7-node
environment:
MEMCACHED_HOST: '127.0.0.1:11211'
REDIS_URL: 'redis://127.0.0.1:6379'
DATABASE_URL: 'sqlite3::memory:'
- image: memcached
- image: redis
- image: amazon/dynamodb-local
- image: minio/minio:latest
command: ["server", "/data"]
- image: s12v/sns
- image: softwaremill/elasticmq-native
- image: mongo:5-focal
ruby_27_mysql2:
docker:
- image: cimg/ruby:2.7-node
environment:
DATABASE_URL: "mysql2://[email protected]:3306/ci_test"
- image: mariadb
environment:
MYSQL_DATABASE: 'ci_test'
MYSQL_USER: 'root'
MYSQL_PASSWORD: ''
MYSQL_ALLOW_EMPTY_PASSWORD: 'yes'
MYSQL_ROOT_PASSWORD: ''
MYSQL_ROOT_HOST: '%'
ruby_27_postgres:
docker:
- image: cimg/ruby:2.7-node
environment:
DATABASE_URL: "postgres://postgres:[email protected]:5432/ci_test"
- image: postgres
environment:
POSTGRES_PASSWORD: 'test'
POSTGRES_DB: 'ci_test'
ruby_30:
docker:
- image: cimg/ruby:3.0-node
Expand Down Expand Up @@ -297,7 +260,7 @@ jobs:
parameters:
stack:
type: executor
default: ruby_27
default: ruby_30
executor: << parameters.stack >>
steps:
- checkout
Expand All @@ -307,7 +270,7 @@ jobs:
parameters:
stack:
type: executor
default: ruby_27
default: ruby_30
gemfile:
type: string
default: "./gemfiles/aws_30.gemfile"
Expand All @@ -320,7 +283,7 @@ jobs:
- setup
- run_tests
lint:
executor: ruby_27
executor: ruby_30
steps:
- checkout
- setup
Expand All @@ -331,7 +294,7 @@ jobs:
- checkout
- run_sonarqube
publish:
executor: ruby_27
executor: ruby_30
steps:
- checkout
- setup
Expand All @@ -353,7 +316,6 @@ workflows:
matrix:
parameters:
stack:
- ruby_27
- ruby_30
- ruby_31
- ruby_32
Expand Down Expand Up @@ -386,27 +348,6 @@ workflows:
# https://www.ruby-lang.org/en/news/2022/11/11/ruby-3-2-0-preview3-released/
- stack: ruby_32
gemfile: "./gemfiles/sinatra_14.gemfile"
libraries_ruby_2:
jobs:
- test_apprisal:
matrix:
parameters:
stack:
- ruby_27
<<: *library_gemfile
rails_ruby_2:
jobs:
- test_apprisal:
matrix:
parameters:
stack:
- ruby_27
- ruby_27_postgres
- ruby_27_mysql2
gemfile:
- "./gemfiles/rails_60.gemfile"
- "./gemfiles/rails_52.gemfile"
- "./gemfiles/rails_50.gemfile"
rails_ruby_3:
jobs:
- test_apprisal:
Expand Down
2 changes: 1 addition & 1 deletion instana.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ Gem::Specification.new do |spec|
spec.require_paths = ["lib"]
spec.test_files = Dir.glob("{test}/**/*.rb")

spec.required_ruby_version = '>= 2.7'
spec.required_ruby_version = '>= 3.0'
spec.platform = defined?(JRUBY_VERSION) ? 'java' : Gem::Platform::RUBY

spec.add_development_dependency "bundler", "~> 2.0"
Expand Down

0 comments on commit c563ed0

Please sign in to comment.