Skip to content

Commit

Permalink
Fixed travis CI config
Browse files Browse the repository at this point in the history
  • Loading branch information
tsukasaoishi committed Feb 11, 2019
1 parent 5bbdd32 commit 50a20ae
Show file tree
Hide file tree
Showing 7 changed files with 8 additions and 19 deletions.
8 changes: 5 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ language: ruby
services:
- mysql
- postgresql
before_script:
- bundle update
cache: bundler
before_install:
- gem uninstall -v '>= 2' -i $(rvm gemdir)@global -ax bundler || true
- gem install bundler -v '< 2'
rvm:
- 2.3.8
- 2.4.5
Expand All @@ -14,6 +14,8 @@ gemfile:
- gemfiles/rails50.gemfile
- gemfiles/rails51.gemfile
- gemfiles/rails52.gemfile
script:
- "bin/test"
matrix:
fast_finish: true
bundler_args: --jobs 3 --retry 3
6 changes: 0 additions & 6 deletions Appraisals
Original file line number Diff line number Diff line change
@@ -1,20 +1,14 @@
appraise "rails50" do
gem 'activerecord', '~> 5.0.0'
gem 'activesupport', '~> 5.0.0'
gem 'mysql2', '>= 0.3.18', '< 0.6.0'
gem 'pg', '>= 0.18', '< 2.0'
end

appraise "rails51" do
gem 'activerecord', '~> 5.1.0'
gem 'activesupport', '~> 5.1.0'
gem 'mysql2', '>= 0.3.18', '< 0.6.0'
gem 'pg', '>= 0.18', '< 2.0'
end

appraise "rails52" do
gem 'activerecord', '~> 5.2.0'
gem 'activesupport', '~> 5.2.0'
gem 'mysql2', '>= 0.4.4', '< 0.6.0'
gem 'pg', '>= 0.18', '< 2.0'
end
6 changes: 3 additions & 3 deletions bin/test
Original file line number Diff line number Diff line change
Expand Up @@ -6,19 +6,19 @@ set -vx

if [ -v DATABASE_URL ]; then
echo "[specified config]"
bundle exec appraisal rake test
bundle exec rake test
else
echo "[mysql]"
DATABASE_URL="mysql2://root@localhost/fresh_connection_test_master" \
DATABASE_REPLICA1_URL="mysql2://root@localhost/fresh_connection_test_replica1" \
DATABASE_REPLICA2_URL="mysql2://root@localhost/fresh_connection_test_replica2" \
DATABASE_FAKE_REPLICA_URL="mysql2://root@localhost/fresh_connection_test_master" \
bundle exec appraisal rake test
bundle exec rake test

echo "[postgresql]"
DATABASE_URL="postgresql://localhost/fresh_connection_test_master" \
DATABASE_REPLICA1_URL="postgresql://localhost/fresh_connection_test_replica1" \
DATABASE_REPLICA2_URL="postgresql://localhost/fresh_connection_test_replica2" \
DATABASE_FAKE_REPLICA_URL="postgresql://localhost/fresh_connection_test_master" \
bundle exec appraisal rake test
bundle exec rake test
fi
1 change: 0 additions & 1 deletion fresh_connection.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ Gem::Specification.new do |spec|
spec.add_development_dependency 'pg', '>= 0.18', '< 2.0'
spec.add_development_dependency "rake", ">= 0.8.7"
spec.add_development_dependency 'appraisal'
spec.add_development_dependency 'irb'
spec.add_development_dependency "minitest", "~> 5.10.0"
spec.add_development_dependency "minitest-reporters"
spec.add_development_dependency "benchmark-ips"
Expand Down
2 changes: 0 additions & 2 deletions gemfiles/rails50.gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,5 @@ source "https://rubygems.org"

gem "activerecord", "~> 5.0.0"
gem "activesupport", "~> 5.0.0"
gem "mysql2", ">= 0.3.18", "< 0.6.0"
gem "pg", ">= 0.18", "< 2.0"

gemspec path: "../"
2 changes: 0 additions & 2 deletions gemfiles/rails51.gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,5 @@ source "https://rubygems.org"

gem "activerecord", "~> 5.1.0"
gem "activesupport", "~> 5.1.0"
gem "mysql2", ">= 0.3.18", "< 0.6.0"
gem "pg", ">= 0.18", "< 2.0"

gemspec path: "../"
2 changes: 0 additions & 2 deletions gemfiles/rails52.gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,5 @@ source "https://rubygems.org"

gem "activerecord", "~> 5.2.0"
gem "activesupport", "~> 5.2.0"
gem "mysql2", ">= 0.4.4", "< 0.6.0"
gem "pg", ">= 0.18", "< 2.0"

gemspec path: "../"

0 comments on commit 50a20ae

Please sign in to comment.