Skip to content

Commit

Permalink
Test both Rails 5.1 and 5.2 on CircleCI
Browse files Browse the repository at this point in the history
  • Loading branch information
jhawthorn committed May 3, 2018
1 parent 8242d03 commit 9e83866
Show file tree
Hide file tree
Showing 2 changed files with 20 additions and 3 deletions.
20 changes: 17 additions & 3 deletions .circleci/config.yml
@@ -1,6 +1,6 @@
version: 2
jobs:
postgres:
postgres: &postgres
working_directory: &workdir ~/solidus
environment: &environment
DB: postgresql
Expand Down Expand Up @@ -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
Expand All @@ -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
3 changes: 3 additions & 0 deletions Gemfile
Expand Up @@ -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
Expand Down

0 comments on commit 9e83866

Please sign in to comment.