From 9e8386638eb86a5abf10e3c3255e7ad7f83e8479 Mon Sep 17 00:00:00 2001 From: John Hawthorn Date: Fri, 27 Apr 2018 14:03:18 -0700 Subject: [PATCH] Test both Rails 5.1 and 5.2 on CircleCI --- .circleci/config.yml | 20 +++++++++++++++++--- Gemfile | 3 +++ 2 files changed, 20 insertions(+), 3 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index dbb549eaf34..ecb3b4c82f9 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -1,6 +1,6 @@ version: 2 jobs: - postgres: + postgres: &postgres working_directory: &workdir ~/solidus environment: &environment DB: postgresql @@ -46,9 +46,9 @@ jobs: - store_test_results: path: /tmp/test-results - mysql: + mysql: &mysql working_directory: *workdir - environment: + environment: &mysql_environment <<: *environment DB: mysql DB_HOST: 127.0.0.1 @@ -58,9 +58,23 @@ jobs: parallelism: *parallelism steps: *steps + postgres_rails51: + <<: *postgres + environment: + <<: *environment + RAILS_VERSION: '~> 5.1.0' + + mysql_rails51: + <<: *mysql + environment: + <<: *mysql_environment + RAILS_VERSION: '~> 5.1.0' + workflows: version: 2 build: jobs: - postgres - mysql + - postgres_rails51 + - mysql_rails51 diff --git a/Gemfile b/Gemfile index 3ddab629600..fc5a3e7abf3 100644 --- a/Gemfile +++ b/Gemfile @@ -4,6 +4,9 @@ source 'https://rubygems.org' gemspec require: false +rails_version = ENV['RAILS_VERSION'] || '~> 5.2.0' +gem 'rails', rails_version, require: false + platforms :ruby do gem 'mysql2', '~> 0.5.0', require: false gem 'pg', '~> 1.0', require: false