From 60b4733c8d30e9e78d795ab8a0034436fc194bf3 Mon Sep 17 00:00:00 2001 From: jrgriffiniii Date: Mon, 18 Apr 2022 10:05:26 -0400 Subject: [PATCH] Updating the CircleCI configuration to support nightly builds; Updating the configuration to test against Ruby 2.7, 2.6, and 2.5 releases; Updating the configuration to test against Rails 6.0.4.7, 5.2.4; Setting the default Rails release to be used as the latest 6.0 release --- .circleci/config.yml | 80 +++++++++++++++++++++++++++++++++++--------- Gemfile | 8 ++++- 2 files changed, 71 insertions(+), 17 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 760de9c17..8dd6fb355 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -1,6 +1,6 @@ version: 2.1 orbs: - samvera: samvera/circleci-orb@0 + samvera: samvera/circleci-orb@1.0 jobs: bundle_lint_test: parameters: @@ -8,14 +8,14 @@ jobs: type: string bundler_version: type: string - default: 2.0.1 + default: 2.3.11 rails_version: type: string solr_config_path: type: string default: lib/generators/active_fedora/config/solr/templates/solr/conf executor: - name: 'samvera/ruby_fcrepo_solr' + name: 'samvera/ruby_fcrepo_solr_redis_postgres' ruby_version: << parameters.ruby_version >> environment: RAILS_VERSION: << parameters.rails_version >> @@ -31,7 +31,7 @@ jobs: echo "$(git branch --all --list master */master)" fi [[ -z "$(git branch --all --list master */master)" ]] - + - samvera/bundle_for_gem: ruby_version: << parameters.ruby_version >> bundler_version: << parameters.bundler_version >> @@ -47,31 +47,79 @@ jobs: workflows: ci: jobs: + # Ruby 2.7 releases + - bundle_lint_test: + name: ruby2-7_rails6-0 + ruby_version: 2.7.5 + rails_version: 6.0.4.7 - bundle_lint_test: name: ruby2-7_rails5-2 - ruby_version: 2.7.0 + ruby_version: 2.7.5 rails_version: 5.2.4 + # Ruby 2.6 releases + - bundle_lint_test: + name: ruby2-6_rails6-0 + ruby_version: 2.6.9 + rails_version: 6.0.4.7 - bundle_lint_test: name: ruby2-6_rails5-2 - ruby_version: 2.6.5 + ruby_version: 2.6.9 rails_version: 5.2.4 + # Ruby 2.5 releases + - bundle_lint_test: + name: ruby2-5_rails6.0 + ruby_version: 2.5.9 + rails_version: 6.0.4.7 - bundle_lint_test: name: ruby2-5_rails5-2 - ruby_version: 2.5.7 + ruby_version: 2.5.9 rails_version: 5.2.4 + + nightly: + triggers: + - schedule: + cron: "0 0 * * *" + filters: + branches: + only: + - main + jobs: + # Ruby 2.7 releases - bundle_lint_test: - name: ruby2-4_rails5-2 - ruby_version: 2.4.9 - rails_version: 5.2.4 + name: ruby2-7_rails6-1 + ruby_version: 2.7.5 + rails_version: 6.1.5 - bundle_lint_test: name: ruby2-7_rails6-0 - ruby_version: 2.7.0 - rails_version: 6.0.2 + ruby_version: 2.7.5 + rails_version: 6.0.4.7 + - bundle_lint_test: + name: ruby2-7_rails5-2 + ruby_version: 2.7.5 + rails_version: 5.2.4 + # Ruby 2.6 releases + - bundle_lint_test: + name: ruby2-6_rails6-1 + ruby_version: 2.6.9 + rails_version: 6.1.5 - bundle_lint_test: name: ruby2-6_rails6-0 - ruby_version: 2.6.5 - rails_version: 6.0.2 + ruby_version: 2.6.9 + rails_version: 6.0.4.7 + - bundle_lint_test: + name: ruby2-6_rails5-2 + ruby_version: 2.6.9 + rails_version: 5.2.4 + # Ruby 2.5 releases + - bundle_lint_test: + name: ruby2-5_rails6-1 + ruby_version: 2.5.9 + rails_version: 6.1.5 - bundle_lint_test: name: ruby2-5_rails6.0 - ruby_version: 2.5.7 - rails_version: 6.0.2 + ruby_version: 2.5.9 + rails_version: 6.0.4.7 + - bundle_lint_test: + name: ruby2-5_rails5-2 + ruby_version: 2.5.9 + rails_version: 5.2.4 diff --git a/Gemfile b/Gemfile index 4017ce49e..f64e303c7 100644 --- a/Gemfile +++ b/Gemfile @@ -7,7 +7,13 @@ gemspec path: File.expand_path('..', __FILE__) gem 'byebug' unless ENV['TRAVIS'] gem 'pry-byebug' unless ENV['CI'] -gem 'activemodel', ENV['RAILS_VERSION'] if ENV['RAILS_VERSION'] +if ENV['RAILS_VERSION'] + gem 'activemodel', ENV['RAILS_VERSION'] + gem 'rails', ENV['RAILS_VERSION'] +else + gem 'activemodel', '~> 6.0.4', '< 7' + gem 'rails', '~> 6.0.4', '< 7' +end group :test do gem 'simplecov', require: false