summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJared Norman <jared@super.gd>2020-07-07 16:36:36 -0700
committerJared Norman <jared@super.gd>2020-07-07 16:36:36 -0700
commitdef4803b461559a3420912f63d83fa6e4bf3ecfe (patch)
treed3f843c86420e758bb11f64f255a1f923072393d
parent7fa3cdd016e49608fd71327f1d5017dfc666a8c1 (diff)
Fix CI
-rw-r--r--.travis.yml11
-rw-r--r--Gemfile2
2 files changed, 7 insertions, 6 deletions
diff --git a/.travis.yml b/.travis.yml
index 4598c2e..c4ebfce 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,11 +3,12 @@ dist: trusty
sudo: false
language: ruby
cache: bundler
-rvm:
- - 2.3.7
-env:
- matrix:
- - SOLIDUS_BRANCH=v2.4 DB=postgres RAILS_VERSION="~> 5.1.0"
+jobs:
+ include:
+ - rvm: 2.5.8
+ env: SOLIDUS_BRANCH=v2.9 DB=postgresql RAILS_VERSION="~> 5.1.0"
+ - rvm: 2.6.6
+ env: SOLIDUS_BRANCH=v2.10 DB=postgresql RAILS_VERSION="~> 5.2.0"
before_install:
- gem update --system
- gem install bundler
diff --git a/Gemfile b/Gemfile
index 1bebf01..6be78e4 100644
--- a/Gemfile
+++ b/Gemfile
@@ -9,7 +9,7 @@ gem "solidus", github: "solidusio/solidus", branch: branch
# Needed to help Bundler figure out how to resolve dependencies,
# otherwise it takes forever to resolve them.
# See https://github.com/bundler/bundler/issues/6677
-gem "rails", ">0.a"
+gem "rails", ENV.fetch("RAILS_VERSION") { ">0.a" }
# Provides basic authentication functionality for testing parts of your engine
gem "solidus_auth_devise"