Build matrix: finalize minimized matrix for 2019

geekq · Apr 11, 2019 · 92a1fd9 · 92a1fd9
1 parent 3a51fcc
commit 92a1fd9
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 30 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -16,40 +16,28 @@ before_script:
 after_script:
   - ./cc-test-reporter after-build --exit-code $TRAVIS_TEST_RESULT
 
-# For Ruby support status see also
-# https://www.ruby-lang.org/en/downloads/branches/
-#~rvm:
-#~  - 2.6
-#~  - 2.5
-#~  - 2.4
-
-# For Rails support status see also
-# https://guides.rubyonrails.org/maintenance_policy.html
-#~gemfile:
-#~  - gemfiles/activerecord-4.1.Gemfile
-#~  - gemfiles/activerecord-4.2.Gemfile
-#~  - gemfiles/activerecord-5.0.Gemfile
-#~  - gemfiles/activerecord-5.1.Gemfile
-#~  - gemfiles/activerecord-5.2.Gemfile
-#~  - gemfiles/activerecord-6.0.Gemfile
-
+# For Ruby support status see:
+#   https://www.ruby-lang.org/en/downloads/branches/
+# For Rails support status see:
+#   https://guides.rubyonrails.org/maintenance_policy.html
+# For valid Ruby-Rails combinations see:
+#   https://www.hmallett.co.uk/2018/08/ruby-and-ruby-on-rails-version-compatibility/
 
 matrix:
   include:
-  - gemfile: gemfiles/activerecord-4.1.Gemfile
-    rvm: 2.4
-
   - gemfile: gemfiles/activerecord-4.2.Gemfile
     rvm: 2.4
 
   - gemfile: gemfiles/activerecord-5.0.Gemfile
-    rvm: 2.3
+    rvm: 2.4
 
   - gemfile: gemfiles/activerecord-5.1.Gemfile
-    rvm: 2.3
+    rvm: 2.4
 
   - gemfile: gemfiles/activerecord-5.2.Gemfile
-    rvm: 2.3
+    rvm: 2.4
+  - gemfile: gemfiles/activerecord-5.2.Gemfile
+    rvm: 2.5
 
   - gemfile: gemfiles/activerecord-6.0.Gemfile
     rvm: 2.6
diff --git a/README.md b/README.md
@@ -189,7 +189,7 @@ Changelog
 ---------
 
 * test build with Ruby 2.6
-* retire Ruby 2.3 since it has reached end of life
+* retire Ruby 2.3 and Rails 4.1 since this Ruby version has reached end of life
 
 ### New in the version 4.1.0
 

diff --git a/gemfiles/activerecord-4.1.Gemfile b/gemfiles/activerecord-4.1.Gemfile