From bb4c5e5899c719d6b0086e7a1c5d102ee6e0bdb0 Mon Sep 17 00:00:00 2001 From: Olle Jonsson Date: Thu, 27 May 2021 13:50:17 +0200 Subject: [PATCH 1/4] CI: Organize matrix to run something run 2.2-2.4 w/ Sprockets 3 on Rails 5.2 stop building on rbx-3 - can not install --- .travis.yml | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) diff --git a/.travis.yml b/.travis.yml index cebc673..9cb8991 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,13 +10,7 @@ rvm: - 2.6 - ruby-head - jruby-9.2.6.0 - - rbx-3 -gemfile: - - Gemfile - - gemfiles/Gemfile-5-2-stable matrix: - exclude: - - gemfile: Gemfile include: - gemfile: Gemfile rvm: 2.5 @@ -25,24 +19,17 @@ matrix: - gemfile: Gemfile rvm: ruby-head - gemfile: Gemfile - rvm: rbx-3 + rvm: jruby-9.2.6.0 - gemfile: gemfiles/Gemfile-5-2-stable rvm: 2.2 - gemfile: gemfiles/Gemfile-5-2-stable rvm: 2.3 - gemfile: gemfiles/Gemfile-5-2-stable rvm: 2.4 - - gemfile: gemfiles/Gemfile-5-2-stable - rvm: 2.5 - - gemfile: gemfiles/Gemfile-5-2-stable - rvm: 2.6 - gemfile: gemfiles/Gemfile-5-2-stable rvm: ruby-head - - gemfile: gemfiles/Gemfile-5-2-stable - rvm: rbx-3 allow_failures: - rvm: ruby-head - - rvm: rbx-3 fast_finish: true notifications: email: false From 00e2882abcf27e5c7cfab24465084f0a4bc0b44e Mon Sep 17 00:00:00 2001 From: Olle Jonsson Date: Thu, 27 May 2021 13:54:54 +0200 Subject: [PATCH 2/4] Gemfile: Rails default branch name --- Gemfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile b/Gemfile index 371e9b8..2b629e2 100644 --- a/Gemfile +++ b/Gemfile @@ -3,4 +3,4 @@ source "https://rubygems.org" # Specify your gem's dependencies in coffee-rails.gemspec gemspec -gem 'rails', git: 'https://github.com/rails/rails' +gem 'rails', git: 'https://github.com/rails/rails', ref: 'main' From 0ef52a1a702b59ea5bd78749807c063e2f916666 Mon Sep 17 00:00:00 2001 From: Olle Jonsson Date: Thu, 27 May 2021 14:05:56 +0200 Subject: [PATCH 3/4] Add more specific Gemfile for Rails versions --- .travis.yml | 18 +++++++++++++----- gemfiles/Gemfile-6-0-stable | 6 ++++++ gemfiles/Gemfile-6-1-stable | 6 ++++++ 3 files changed, 25 insertions(+), 5 deletions(-) create mode 100644 gemfiles/Gemfile-6-0-stable create mode 100644 gemfiles/Gemfile-6-1-stable diff --git a/.travis.yml b/.travis.yml index 9cb8991..d90f0c4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,5 @@ language: ruby cache: bundler -# To use rbx environment. dist: trusty rvm: - 2.2 @@ -8,17 +7,26 @@ rvm: - 2.4 - 2.5 - 2.6 + - 2.7 - ruby-head - jruby-9.2.6.0 matrix: include: - gemfile: Gemfile - rvm: 2.5 - - gemfile: Gemfile - rvm: 2.6 + rvm: 2.7 - gemfile: Gemfile rvm: ruby-head - - gemfile: Gemfile + - gemfile: gemfiles/Gemfile-6-1-stable + rvm: 2.7 + - gemfile: gemfiles/Gemfile-6-1-stable + rvm: 2.6 + - gemfile: gemfiles/Gemfile-6-1-stable + rvm: 2.5 + - gemfile: gemfiles/Gemfile-6-0-stable + rvm: 2.6 + - gemfile: gemfiles/Gemfile-6-0-stable + rvm: 2.5 + - gemfile: gemfiles/Gemfile-6-0-stable rvm: jruby-9.2.6.0 - gemfile: gemfiles/Gemfile-5-2-stable rvm: 2.2 diff --git a/gemfiles/Gemfile-6-0-stable b/gemfiles/Gemfile-6-0-stable new file mode 100644 index 0000000..fc492e7 --- /dev/null +++ b/gemfiles/Gemfile-6-0-stable @@ -0,0 +1,6 @@ +source "https://rubygems.org" + +gemspec path: '..' + +gem 'rails', git: 'https://github.com/rails/rails', ref: '6-0-stable' + diff --git a/gemfiles/Gemfile-6-1-stable b/gemfiles/Gemfile-6-1-stable new file mode 100644 index 0000000..1834e9d --- /dev/null +++ b/gemfiles/Gemfile-6-1-stable @@ -0,0 +1,6 @@ +source "https://rubygems.org" + +gemspec path: '..' + +gem 'rails', git: 'https://github.com/rails/rails', ref: '6-1-stable' + From 5a1865f63fddf86eb415abc1b646da3e8615720b Mon Sep 17 00:00:00 2001 From: Olle Jonsson Date: Thu, 27 May 2021 14:09:09 +0200 Subject: [PATCH 4/4] CI: Explicit matrix only --- .travis.yml | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/.travis.yml b/.travis.yml index d90f0c4..76435dd 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,41 +1,33 @@ language: ruby cache: bundler dist: trusty -rvm: - - 2.2 - - 2.3 - - 2.4 - - 2.5 - - 2.6 - - 2.7 - - ruby-head - - jruby-9.2.6.0 matrix: include: - gemfile: Gemfile rvm: 2.7 - gemfile: Gemfile rvm: ruby-head + - gemfile: gemfiles/Gemfile-6-1-stable rvm: 2.7 - gemfile: gemfiles/Gemfile-6-1-stable rvm: 2.6 - gemfile: gemfiles/Gemfile-6-1-stable rvm: 2.5 + - gemfile: gemfiles/Gemfile-6-0-stable rvm: 2.6 - gemfile: gemfiles/Gemfile-6-0-stable rvm: 2.5 - gemfile: gemfiles/Gemfile-6-0-stable rvm: jruby-9.2.6.0 + - gemfile: gemfiles/Gemfile-5-2-stable rvm: 2.2 - gemfile: gemfiles/Gemfile-5-2-stable rvm: 2.3 - gemfile: gemfiles/Gemfile-5-2-stable rvm: 2.4 - - gemfile: gemfiles/Gemfile-5-2-stable - rvm: ruby-head allow_failures: - rvm: ruby-head fast_finish: true