Merge pull request #175 from collectiveidea/travis-updates

Fix up travis config for platform updates
collectiveidea · Aug 16, 2019 · aa1a4d8 · aa1a4d8
2 parents 86de647 + 5429c1a
commit aa1a4d8
Show file tree

Hide file tree

Showing 43 changed files with 109 additions and 30 deletions.
diff --git a/.rubocop.yml b/.rubocop.yml
@@ -1,5 +1,6 @@
-# Load the rubocop-rspec gem
-require: rubocop-rspec
+require:
+  - rubocop-rails
+  - rubocop-rspec
 
 Rails:
   Enabled: true

diff --git a/.travis.yml b/.travis.yml
@@ -2,6 +2,9 @@ language: ruby
 branches:
   only:
     - master
+services:
+  - mysql
+  - postgresql
 before_script:
   - mysql -e 'create database delayed_job_test;'
   - mysql --version
@@ -23,12 +26,12 @@ gemfile: # Supported
   - gemfiles/sqlite3/5-2.gemfile
 rvm: # Supported
   - 2.3.8
-  - 2.4.5
-  - 2.5.3
-  - 2.6.1
-  - jruby-9.1.8.0
+  - 2.4.6
+  - 2.5.5
+  - 2.6.3
+  - jruby-9.2.7.0
 
-jdk: oraclejdk8
+jdk: oraclejdk11
 
 matrix:
   allow_failures:
@@ -41,40 +44,40 @@ matrix:
     # The two combinations below are currently broken. We should stop allowing
     # failure as the issue is resolved. See:
     # https://github.com/jruby/activerecord-jdbc-adapter/issues/700
-    - rvm: jruby-9.1.8.0
+    - rvm: jruby-9.2.7.0
       gemfile: gemfiles/mysql2/5-1.gemfile
-    - rvm: jruby-9.1.8.0
+    - rvm: jruby-9.2.7.0
       gemfile: gemfiles/postgresql/5-1.gemfile
-    - rvm: jruby-9.1.8.0
+    - rvm: jruby-9.2.7.0
       gemfile: gemfiles/mysql2/5-2.gemfile
-    - rvm: jruby-9.1.8.0
+    - rvm: jruby-9.2.7.0
       gemfile: gemfiles/postgresql/5-2.gemfile
-    - rvm: jruby-9.1.8.0
+    - rvm: jruby-9.2.7.0
       gemfile: gemfiles/sqlite3/5-2.gemfile
 
   include:
     #
     # Rubocop
     #
-    - rvm: 2.5.1
+    - rvm: 2.5.5
       gemfile: Gemfile
       env:
         - COMMAND=rubocop
     #
     # The future
     #
     # Active Record head
-    - rvm: 2.5.3
+    - rvm: 2.5.5
       gemfile: gemfiles/mysql2/master.gemfile
-    - rvm: 2.5.3
+    - rvm: 2.5.5
       gemfile: gemfiles/postgresql/master.gemfile
-    - rvm: 2.5.3
+    - rvm: 2.5.5
       gemfile: gemfiles/sqlite3/master.gemfile
-    - rvm: 2.6.1
+    - rvm: 2.6.3
       gemfile: gemfiles/mysql2/master.gemfile
-    - rvm: 2.6.1
+    - rvm: 2.6.3
       gemfile: gemfiles/postgresql/master.gemfile
-    - rvm: 2.6.1
+    - rvm: 2.6.3
       gemfile: gemfiles/sqlite3/master.gemfile
     # MRI Ruby head
     - rvm: ruby-head
@@ -95,18 +98,12 @@ matrix:
     #
     # EOL Active Record
     # Rails 3.2 was maintained longer and is ruby 2.2 compatible
-    - rvm: 2.2.10
-      gemfile: gemfiles/mysql2/3-2.gemfile
     - rvm: 2.2.10
       gemfile: gemfiles/postgresql/3-2.gemfile
     - rvm: 2.2.10
       gemfile: gemfiles/sqlite3/3-2.gemfile
     # Rails <= 4.0 was only compatible with ruby 2.0
     # The test were running, but there are known incompatibilites
-    - rvm: 2.0.0-p648
-      gemfile: gemfiles/mysql2/3-0.gemfile
-    - rvm: 2.0.0-p648
-      gemfile: gemfiles/mysql2/3-1.gemfile
     - rvm: 2.0.0-p648
       gemfile: gemfiles/postgresql/3-0.gemfile
     - rvm: 2.0.0-p648
@@ -115,8 +112,6 @@ matrix:
       gemfile: gemfiles/sqlite3/3-0.gemfile
     - rvm: 2.0.0-p648
       gemfile: gemfiles/sqlite3/3-1.gemfile
-    - rvm: 2.0.0-p648
-      gemfile: gemfiles/mysql2/4-0.gemfile
     - rvm: 2.0.0-p648
       gemfile: gemfiles/postgresql/4-0.gemfile
     - rvm: 2.0.0-p648
@@ -129,11 +124,11 @@ matrix:
     - rvm: 2.1.9
       gemfile: gemfiles/sqlite3/4-1.gemfile
     # Rails 5.0 was EOL with the release of 5.2
-    - rvm: 2.4.4
+    - rvm: 2.4.6
       gemfile: gemfiles/mysql2/5-0.gemfile
-    - rvm: 2.4.4
+    - rvm: 2.4.6
       gemfile: gemfiles/postgresql/5-0.gemfile
-    - rvm: 2.4.4
+    - rvm: 2.4.6
       gemfile: gemfiles/sqlite3/5-0.gemfile
     #
     # The parallel dimension

diff --git a/Gemfile b/Gemfile
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 source "https://rubygems.org"
 
 gem "rake"
@@ -18,6 +20,7 @@ group :test do
   gem "coveralls", require: false
   gem "rspec", ">= 3"
   gem "rubocop"
+  gem "rubocop-rails"
   gem "rubocop-rspec"
   gem "simplecov", require: false
 end

diff --git a/Rakefile b/Rakefile
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "bundler/gem_helper"
 Bundler::GemHelper.install_tasks
 

diff --git a/delayed_job_active_record.gemspec b/delayed_job_active_record.gemspec
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 Gem::Specification.new do |spec|
   spec.add_dependency "activerecord", [">= 3.0", "< 5.3"]
   spec.add_dependency "delayed_job",  [">= 3.0", "< 5"]

diff --git a/gemfiles/mysql2/3-0.gemfile b/gemfiles/mysql2/3-0.gemfile
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 source "https://rubygems.org"
 
 gem "rake"

diff --git a/gemfiles/mysql2/3-1.gemfile b/gemfiles/mysql2/3-1.gemfile
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 source "https://rubygems.org"
 
 gem "rake"

diff --git a/gemfiles/mysql2/3-2.gemfile b/gemfiles/mysql2/3-2.gemfile
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 source "https://rubygems.org"
 
 gem "rake"

diff --git a/gemfiles/mysql2/4-0.gemfile b/gemfiles/mysql2/4-0.gemfile
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 source "https://rubygems.org"
 
 gem "rake"

diff --git a/gemfiles/mysql2/4-1.gemfile b/gemfiles/mysql2/4-1.gemfile
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 source "https://rubygems.org"
 
 gem "rake"

diff --git a/gemfiles/mysql2/4-2.gemfile b/gemfiles/mysql2/4-2.gemfile
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 source "https://rubygems.org"
 
 gem "rake"

diff --git a/gemfiles/mysql2/5-0.gemfile b/gemfiles/mysql2/5-0.gemfile
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 source "https://rubygems.org"
 
 gem "rake"

diff --git a/gemfiles/mysql2/5-1.gemfile b/gemfiles/mysql2/5-1.gemfile
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 source "https://rubygems.org"
 
 gem "rake"

diff --git a/gemfiles/mysql2/5-2.gemfile b/gemfiles/mysql2/5-2.gemfile
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 source "https://rubygems.org"
 
 gem "rake"

diff --git a/gemfiles/mysql2/master.gemfile b/gemfiles/mysql2/master.gemfile
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 source "https://rubygems.org"
 
 gem "rake"

diff --git a/gemfiles/postgresql/3-0.gemfile b/gemfiles/postgresql/3-0.gemfile
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 source "https://rubygems.org"
 
 gem "rake"

diff --git a/gemfiles/postgresql/3-1.gemfile b/gemfiles/postgresql/3-1.gemfile
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 source "https://rubygems.org"
 
 gem "rake"

diff --git a/gemfiles/postgresql/3-2.gemfile b/gemfiles/postgresql/3-2.gemfile
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 source "https://rubygems.org"
 
 gem "rake"

diff --git a/gemfiles/postgresql/4-0.gemfile b/gemfiles/postgresql/4-0.gemfile
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 source "https://rubygems.org"
 
 gem "rake"

diff --git a/gemfiles/postgresql/4-1.gemfile b/gemfiles/postgresql/4-1.gemfile
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 source "https://rubygems.org"
 
 gem "rake"

diff --git a/gemfiles/postgresql/4-2.gemfile b/gemfiles/postgresql/4-2.gemfile
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 source "https://rubygems.org"
 
 gem "rake"

diff --git a/gemfiles/postgresql/5-0.gemfile b/gemfiles/postgresql/5-0.gemfile
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 source "https://rubygems.org"
 
 gem "rake"

diff --git a/gemfiles/postgresql/5-1.gemfile b/gemfiles/postgresql/5-1.gemfile
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 source "https://rubygems.org"
 
 gem "rake"

diff --git a/gemfiles/postgresql/5-2.gemfile b/gemfiles/postgresql/5-2.gemfile
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 source "https://rubygems.org"
 
 gem "rake"

diff --git a/gemfiles/postgresql/master.gemfile b/gemfiles/postgresql/master.gemfile
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 source "https://rubygems.org"
 
 gem "rake"

diff --git a/gemfiles/sqlite3/3-0.gemfile b/gemfiles/sqlite3/3-0.gemfile
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 source "https://rubygems.org"
 
 gem "rake"

diff --git a/gemfiles/sqlite3/3-1.gemfile b/gemfiles/sqlite3/3-1.gemfile
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 source "https://rubygems.org"
 
 gem "rake"

diff --git a/gemfiles/sqlite3/3-2.gemfile b/gemfiles/sqlite3/3-2.gemfile
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 source "https://rubygems.org"
 
 gem "rake"

diff --git a/gemfiles/sqlite3/4-0.gemfile b/gemfiles/sqlite3/4-0.gemfile
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 source "https://rubygems.org"
 
 gem "rake"

diff --git a/gemfiles/sqlite3/4-1.gemfile b/gemfiles/sqlite3/4-1.gemfile
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 source "https://rubygems.org"
 
 gem "rake"

diff --git a/gemfiles/sqlite3/4-2.gemfile b/gemfiles/sqlite3/4-2.gemfile
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 source "https://rubygems.org"
 
 gem "rake"

diff --git a/gemfiles/sqlite3/5-0.gemfile b/gemfiles/sqlite3/5-0.gemfile
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 source "https://rubygems.org"
 
 gem "rake"

diff --git a/gemfiles/sqlite3/5-1.gemfile b/gemfiles/sqlite3/5-1.gemfile
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 source "https://rubygems.org"
 
 gem "rake"

diff --git a/gemfiles/sqlite3/5-2.gemfile b/gemfiles/sqlite3/5-2.gemfile
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 source "https://rubygems.org"
 
 gem "rake"

diff --git a/gemfiles/sqlite3/master.gemfile b/gemfiles/sqlite3/master.gemfile
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 source "https://rubygems.org"
 
 gem "rake"

diff --git a/lib/delayed/backend/active_record.rb b/lib/delayed/backend/active_record.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "active_record/version"
 module Delayed
   module Backend

diff --git a/lib/delayed_job_active_record.rb b/lib/delayed_job_active_record.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "active_record"
 require "delayed_job"
 require "delayed/backend/active_record"

diff --git a/lib/generators/delayed_job/active_record_generator.rb b/lib/generators/delayed_job/active_record_generator.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "generators/delayed_job/delayed_job_generator"
 require "generators/delayed_job/next_migration_version"
 require "rails/generators/migration"

diff --git a/lib/generators/delayed_job/next_migration_version.rb b/lib/generators/delayed_job/next_migration_version.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module DelayedJob
   module NextMigrationVersion
     # while methods have moved around this has been the implementation

diff --git a/lib/generators/delayed_job/upgrade_generator.rb b/lib/generators/delayed_job/upgrade_generator.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "generators/delayed_job/delayed_job_generator"
 require "generators/delayed_job/next_migration_version"
 require "rails/generators/migration"

diff --git a/spec/delayed/backend/active_record_spec.rb b/spec/delayed/backend/active_record_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "helper"
 require "delayed/backend/active_record"
 

diff --git a/spec/delayed/serialization/active_record_spec.rb b/spec/delayed/serialization/active_record_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "helper"
 
 describe ActiveRecord do

diff --git a/spec/helper.rb b/spec/helper.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "simplecov"
 require "coveralls"