From 78266c19d40b25534b91a20e683fcae4868769d4 Mon Sep 17 00:00:00 2001 From: Gonzalo Rodriguez Date: Tue, 26 Feb 2019 19:07:19 -0300 Subject: [PATCH 1/2] ci: get Travis to test against rails 6 betas --- .travis.yml | 2 ++ Appraisals | 5 +++++ gemfiles/rails_6_0.gemfile | 8 ++++++++ 3 files changed, 15 insertions(+) create mode 100644 gemfiles/rails_6_0.gemfile diff --git a/.travis.yml b/.travis.yml index f10c60c..9006d27 100644 --- a/.travis.yml +++ b/.travis.yml @@ -16,6 +16,7 @@ before_install: gemfile: - gemfiles/rack_2_0.gemfile - gemfiles/rack_1_6.gemfile + - gemfiles/rails_6_0.gemfile - gemfiles/rails_5_2.gemfile - gemfiles/rails_5_1.gemfile - gemfiles/rails_4_2.gemfile @@ -31,6 +32,7 @@ gemfile: matrix: allow_failures: - rvm: ruby-head + - gemfile: gemfiles/rails_6_0.gemfile fast_finish: true diff --git a/Appraisals b/Appraisals index f1f8288..edf592a 100644 --- a/Appraisals +++ b/Appraisals @@ -17,6 +17,11 @@ appraise "rack_1_6" do gem "rack-test", ">= 0.6" end +appraise 'rails_6_0' do + gem 'actionpack', '~> 6.0.0.a' + gem 'activesupport', '~> 6.0.0.a' +end + appraise 'rails_5-2' do gem 'actionpack', '~> 5.2.0' gem 'activesupport', '~> 5.2.0' diff --git a/gemfiles/rails_6_0.gemfile b/gemfiles/rails_6_0.gemfile new file mode 100644 index 0000000..ed2247a --- /dev/null +++ b/gemfiles/rails_6_0.gemfile @@ -0,0 +1,8 @@ +# This file was generated by Appraisal + +source "https://rubygems.org" + +gem "actionpack", "~> 6.0.0.a" +gem "activesupport", "~> 6.0.0.a" + +gemspec path: "../" From f79637559f98ff066c0a93a547d216715888c0f2 Mon Sep 17 00:00:00 2001 From: Gonzalo Rodriguez Date: Tue, 26 Feb 2019 22:27:14 -0300 Subject: [PATCH 2/2] ci: don't run tests for rails 6 against incompatible ruby versions --- .travis.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 9006d27..601f6ca 100644 --- a/.travis.yml +++ b/.travis.yml @@ -33,7 +33,11 @@ matrix: allow_failures: - rvm: ruby-head - gemfile: gemfiles/rails_6_0.gemfile - + exclude: + - gemfile: gemfiles/rails_6_0.gemfile + rvm: 2.4.5 + - gemfile: gemfiles/rails_6_0.gemfile + rvm: 2.3.8 fast_finish: true services: