From 2e9eb6716fbcaaeb9590f5d939e2fa861f8639da Mon Sep 17 00:00:00 2001 From: Gonzalo Rodriguez Date: Tue, 10 Apr 2018 11:00:49 -0400 Subject: [PATCH 1/2] Don't allow failures against rails 5.2, it's out now --- .travis.yml | 1 - Appraisals | 4 ++-- gemfiles/rails_5_2.gemfile | 4 ++-- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index 3be689c..dbb0b1f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -31,7 +31,6 @@ gemfile: matrix: allow_failures: - - gemfile: gemfiles/rails_5_2.gemfile - rvm: 2.6.0-preview1 fast_finish: true diff --git a/Appraisals b/Appraisals index 7b03cd3..b9adb10 100644 --- a/Appraisals +++ b/Appraisals @@ -7,8 +7,8 @@ appraise "rack_1_6" do end appraise 'rails_5-2' do - gem 'activesupport', '~> 5.2.0.a' - gem 'actionpack', '~> 5.2.0.a' + gem 'activesupport', '~> 5.2.0' + gem 'actionpack', '~> 5.2.0' end appraise 'rails_5-1' do diff --git a/gemfiles/rails_5_2.gemfile b/gemfiles/rails_5_2.gemfile index 98ef9e7..41b8b1b 100644 --- a/gemfiles/rails_5_2.gemfile +++ b/gemfiles/rails_5_2.gemfile @@ -2,7 +2,7 @@ source "https://rubygems.org" -gem "activesupport", "~> 5.2.0.a" -gem "actionpack", "~> 5.2.0.a" +gem "activesupport", "~> 5.2.0" +gem "actionpack", "~> 5.2.0" gemspec path: "../" From 8a6bb6bc5e5274d358d57861e17f26d9d8ca8607 Mon Sep 17 00:00:00 2001 From: Gonzalo Rodriguez Date: Tue, 10 Apr 2018 11:43:46 -0400 Subject: [PATCH 2/2] Drop support for rails 5.0, it's an unmaintained series now --- .travis.yml | 1 - Appraisals | 5 ----- gemfiles/rails_5_0.gemfile | 8 -------- 3 files changed, 14 deletions(-) delete mode 100644 gemfiles/rails_5_0.gemfile diff --git a/.travis.yml b/.travis.yml index dbb0b1f..612ece6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -25,7 +25,6 @@ gemfile: - gemfiles/rack_1_6.gemfile - gemfiles/rails_5_2.gemfile - gemfiles/rails_5_1.gemfile - - gemfiles/rails_5_0.gemfile - gemfiles/rails_4_2.gemfile - gemfiles/dalli2.gemfile diff --git a/Appraisals b/Appraisals index b9adb10..839a9f4 100644 --- a/Appraisals +++ b/Appraisals @@ -16,11 +16,6 @@ appraise 'rails_5-1' do gem 'actionpack', '~> 5.1.0' end -appraise 'rails_5-0' do - gem 'activesupport', '~> 5.0.0' - gem 'actionpack', '~> 5.0.0' -end - appraise 'rails_4-2' do gem 'activesupport', '~> 4.2.0' gem 'actionpack', '~> 4.2.0' diff --git a/gemfiles/rails_5_0.gemfile b/gemfiles/rails_5_0.gemfile deleted file mode 100644 index c03a540..0000000 --- a/gemfiles/rails_5_0.gemfile +++ /dev/null @@ -1,8 +0,0 @@ -# This file was generated by Appraisal - -source "https://rubygems.org" - -gem "activesupport", "~> 5.0.0" -gem "actionpack", "~> 5.0.0" - -gemspec path: "../"