Skip to content

Commit

Permalink
[from now] 2020/12/28 12:22:31
Browse files Browse the repository at this point in the history
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index ea88908..468bc7f 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -21,7 +21,7 @@ jobs:
           - 2.6.6
     env:
       DB: sqlite3
-      RAILS: ${{ matrix.rails }}
+      BUNDLE_GEMFILE: gemfiles/Gemfile.${{ matrix.rails }}
     steps:
       - uses: actions/checkout@v2
       - name: Set up Ruby
@@ -49,7 +49,7 @@ jobs:
           - 2.6.6
     env:
       DB: mysql
-      RAILS: ${{ matrix.rails }}
+      BUNDLE_GEMFILE: gemfiles/Gemfile.${{ matrix.rails }}
       MYSQL_USERNAME: root
       MYSQL_PASSWORD: root
     steps:
@@ -86,7 +86,7 @@ jobs:
           - 2.6.6
     env:
       DB: postgres
-      RAILS: ${{ matrix.rails }}
+      BUNDLE_GEMFILE: gemfiles/Gemfile.${{ matrix.rails }}
       DATABASE_USERNAME: postgres
       DATABASE_PASSWORD: postgres
       DATABASE_HOST: 127.0.0.1
diff --git a/Gemfile b/Gemfile
index 5bab691..98e8c00 100644
--- a/Gemfile
+++ b/Gemfile
@@ -2,47 +2,19 @@ source 'https://rubygems.org'
 gemspec

 gem 'rake'
-
-rails = ENV['RAILS'] || '6-0-stable'
-
-rails_version = case rails
-                when /\// # A path
-                  File.read(File.join(rails, "RAILS_VERSION"))
-                when /^v/ # A tagged version
-                  rails.gsub(/^v/, '')
-                else
-                  rails
-                end
-
 gem 'faker', '~> 1.0'
-gem 'sqlite3', ::Gem::Version.new(rails_version) >= ::Gem::Version.new('6-0-stable') ? '~> 1.4.1' : '~> 1.3.3'
+gem 'sqlite3', '~> 1.4.1'
 gem 'pg', '~> 1.0'
+gem 'mysql2', '~> 0.5.2'
 gem 'pry', '~> 0.12.2'
 gem 'byebug'

-case rails
-when /\// # A path
-  gem 'activesupport', path: "#{rails}/activesupport"
-  gem 'activemodel', path: "#{rails}/activemodel"
-  gem 'activerecord', path: "#{rails}/activerecord", require: false
-  gem 'actionpack', path: "#{rails}/actionpack"
-  gem 'actionview', path: "#{rails}/actionview"
-when /^v/ # A tagged version
-  git 'https://github.com/rails/rails.git', :tag => rails do
-    gem 'activesupport'
-    gem 'activemodel'
-    gem 'activerecord', require: false
-    gem 'actionpack'
-  end
-else
-  git 'https://github.com/rails/rails.git', :branch => rails do
-    gem 'activesupport'
-    gem 'activemodel'
-    gem 'activerecord', require: false
-    gem 'actionpack'
-  end
+git 'https://github.com/rails/rails.git', :branch => 'master' do
+  gem 'activesupport'
+  gem 'activemodel'
+  gem 'activerecord', require: false
+  gem 'actionpack'
 end
-gem 'mysql2', '~> 0.5.2'

 group :test do
   gem 'machinist', '~> 1.0.6'
diff --git a/gemfiles/Gemfile.5-2-stable b/gemfiles/Gemfile.5-2-stable
new file mode 100644
index 0000000..9a2864d
--- /dev/null
+++ b/gemfiles/Gemfile.5-2-stable
@@ -0,0 +1,33 @@
+source 'https://rubygems.org'
+gemspec path: "../"
+
+gem 'rake'
+gem 'faker', '~> 1.0'
+gem 'sqlite3', '~> 1.3.3'
+gem 'pg', '~> 1.0'
+gem 'mysql2', '~> 0.5.2'
+gem 'pry', '~> 0.12.2'
+gem 'byebug'
+
+git 'https://github.com/rails/rails.git', :branch => '5-2-stable' do
+  gem 'activesupport'
+  gem 'activemodel'
+  gem 'activerecord', require: false
+  gem 'actionpack'
+end
+
+group :test do
+  gem 'machinist', '~> 1.0.6'
+  gem 'rspec', '~> 3'
+  gem 'simplecov', :require => false
+end
+
+group :rubocop do
+  # RuboCop 0.81.0 is the last version which supports Ruby 2.3.
+  # Once Ransack required_ruby_version is bumped, RuboCop version can be bumped.
+  # rubocop/rubocop#7869
+  gem 'rubocop', '=0.81.0', require: false
+end
+
+
+
diff --git a/gemfiles/Gemfile.6-0-stable b/gemfiles/Gemfile.6-0-stable
new file mode 100644
index 0000000..4c35394
--- /dev/null
+++ b/gemfiles/Gemfile.6-0-stable
@@ -0,0 +1,33 @@
+source 'https://rubygems.org'
+gemspec path: "../"
+
+gem 'rake'
+gem 'faker', '~> 1.0'
+gem 'sqlite3', '~> 1.4.1'
+gem 'pg', '~> 1.0'
+gem 'mysql2', '~> 0.5.2'
+gem 'pry', '~> 0.12.2'
+gem 'byebug'
+
+git 'https://github.com/rails/rails.git', :branch => '6-0-stable' do
+  gem 'activesupport'
+  gem 'activemodel'
+  gem 'activerecord', require: false
+  gem 'actionpack'
+end
+
+group :test do
+  gem 'machinist', '~> 1.0.6'
+  gem 'rspec', '~> 3'
+  gem 'simplecov', :require => false
+end
+
+group :rubocop do
+  # RuboCop 0.81.0 is the last version which supports Ruby 2.3.
+  # Once Ransack required_ruby_version is bumped, RuboCop version can be bumped.
+  # rubocop/rubocop#7869
+  gem 'rubocop', '=0.81.0', require: false
+end
+
+
+
diff --git a/gemfiles/Gemfile.v5.2.4 b/gemfiles/Gemfile.v5.2.4
new file mode 100644
index 0000000..e49be0d
--- /dev/null
+++ b/gemfiles/Gemfile.v5.2.4
@@ -0,0 +1,33 @@
+source 'https://rubygems.org'
+gemspec path: "../"
+
+gem 'rake'
+gem 'faker', '~> 1.0'
+gem 'sqlite3', '~> 1.3.3'
+gem 'pg', '~> 1.0'
+gem 'mysql2', '~> 0.5.2'
+gem 'pry', '~> 0.12.2'
+gem 'byebug'
+
+git 'https://github.com/rails/rails.git', :tag => 'v5.2.4' do
+  gem 'activesupport'
+  gem 'activemodel'
+  gem 'activerecord', require: false
+  gem 'actionpack'
+end
+
+group :test do
+  gem 'machinist', '~> 1.0.6'
+  gem 'rspec', '~> 3'
+  gem 'simplecov', :require => false
+end
+
+group :rubocop do
+  # RuboCop 0.81.0 is the last version which supports Ruby 2.3.
+  # Once Ransack required_ruby_version is bumped, RuboCop version can be bumped.
+  # rubocop/rubocop#7869
+  gem 'rubocop', '=0.81.0', require: false
+end
+
+
+
diff --git a/gemfiles/Gemfile.v6.0.3 b/gemfiles/Gemfile.v6.0.3
new file mode 100644
index 0000000..89995d6
--- /dev/null
+++ b/gemfiles/Gemfile.v6.0.3
@@ -0,0 +1,33 @@
+source 'https://rubygems.org'
+gemspec path: "../"
+
+gem 'rake'
+gem 'faker', '~> 1.0'
+gem 'sqlite3', '~> 1.4.1'
+gem 'pg', '~> 1.0'
+gem 'mysql2', '~> 0.5.2'
+gem 'pry', '~> 0.12.2'
+gem 'byebug'
+
+git 'https://github.com/rails/rails.git', :tag => 'v6.0.3' do
+  gem 'activesupport'
+  gem 'activemodel'
+  gem 'activerecord', require: false
+  gem 'actionpack'
+end
+
+group :test do
+  gem 'machinist', '~> 1.0.6'
+  gem 'rspec', '~> 3'
+  gem 'simplecov', :require => false
+end
+
+group :rubocop do
+  # RuboCop 0.81.0 is the last version which supports Ruby 2.3.
+  # Once Ransack required_ruby_version is bumped, RuboCop version can be bumped.
+  # rubocop/rubocop#7869
+  gem 'rubocop', '=0.81.0', require: false
+end
+
+
+
diff --git a/gemfiles/Gemfile.v6.1.0 b/gemfiles/Gemfile.v6.1.0
new file mode 100644
index 0000000..c3224b7
--- /dev/null
+++ b/gemfiles/Gemfile.v6.1.0
@@ -0,0 +1,33 @@
+source 'https://rubygems.org'
+gemspec path: "../"
+
+gem 'rake'
+gem 'faker', '~> 1.0'
+gem 'sqlite3', '~> 1.4.1'
+gem 'pg', '~> 1.0'
+gem 'mysql2', '~> 0.5.2'
+gem 'pry', '~> 0.12.2'
+gem 'byebug'
+
+git 'https://github.com/rails/rails.git', :tag => 'v6.1.0' do
+  gem 'activesupport'
+  gem 'activemodel'
+  gem 'activerecord', require: false
+  gem 'actionpack'
+end
+
+group :test do
+  gem 'machinist', '~> 1.0.6'
+  gem 'rspec', '~> 3'
+  gem 'simplecov', :require => false
+end
+
+group :rubocop do
+  # RuboCop 0.81.0 is the last version which supports Ruby 2.3.
+  # Once Ransack required_ruby_version is bumped, RuboCop version can be bumped.
+  # rubocop/rubocop#7869
+  gem 'rubocop', '=0.81.0', require: false
+end
+
+
+
  • Loading branch information
yahonda committed Dec 28, 2020
1 parent ab836d1 commit 0ea3b0f
Show file tree
Hide file tree
Showing 7 changed files with 175 additions and 38 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/test.yml
Expand Up @@ -21,7 +21,7 @@ jobs:
- 2.6.6
env:
DB: sqlite3
RAILS: ${{ matrix.rails }}
BUNDLE_GEMFILE: gemfiles/Gemfile.${{ matrix.rails }}
steps:
- uses: actions/checkout@v2
- name: Set up Ruby
Expand Down Expand Up @@ -49,7 +49,7 @@ jobs:
- 2.6.6
env:
DB: mysql
RAILS: ${{ matrix.rails }}
BUNDLE_GEMFILE: gemfiles/Gemfile.${{ matrix.rails }}
MYSQL_USERNAME: root
MYSQL_PASSWORD: root
steps:
Expand Down Expand Up @@ -86,7 +86,7 @@ jobs:
- 2.6.6
env:
DB: postgres
RAILS: ${{ matrix.rails }}
BUNDLE_GEMFILE: gemfiles/Gemfile.${{ matrix.rails }}
DATABASE_USERNAME: postgres
DATABASE_PASSWORD: postgres
DATABASE_HOST: 127.0.0.1
Expand Down
42 changes: 7 additions & 35 deletions Gemfile
Expand Up @@ -2,47 +2,19 @@ source 'https://rubygems.org'
gemspec

gem 'rake'

rails = ENV['RAILS'] || '6-0-stable'

rails_version = case rails
when /\// # A path
File.read(File.join(rails, "RAILS_VERSION"))
when /^v/ # A tagged version
rails.gsub(/^v/, '')
else
rails
end

gem 'faker', '~> 1.0'
gem 'sqlite3', ::Gem::Version.new(rails_version) >= ::Gem::Version.new('6-0-stable') ? '~> 1.4.1' : '~> 1.3.3'
gem 'sqlite3', '~> 1.4.1'
gem 'pg', '~> 1.0'
gem 'mysql2', '~> 0.5.2'
gem 'pry', '~> 0.12.2'
gem 'byebug'

case rails
when /\// # A path
gem 'activesupport', path: "#{rails}/activesupport"
gem 'activemodel', path: "#{rails}/activemodel"
gem 'activerecord', path: "#{rails}/activerecord", require: false
gem 'actionpack', path: "#{rails}/actionpack"
gem 'actionview', path: "#{rails}/actionview"
when /^v/ # A tagged version
git 'https://github.com/rails/rails.git', :tag => rails do
gem 'activesupport'
gem 'activemodel'
gem 'activerecord', require: false
gem 'actionpack'
end
else
git 'https://github.com/rails/rails.git', :branch => rails do
gem 'activesupport'
gem 'activemodel'
gem 'activerecord', require: false
gem 'actionpack'
end
git 'https://github.com/rails/rails.git', :branch => 'master' do
gem 'activesupport'
gem 'activemodel'
gem 'activerecord', require: false
gem 'actionpack'
end
gem 'mysql2', '~> 0.5.2'

group :test do
gem 'machinist', '~> 1.0.6'
Expand Down
33 changes: 33 additions & 0 deletions gemfiles/Gemfile.5-2-stable
@@ -0,0 +1,33 @@
source 'https://rubygems.org'
gemspec path: "../"

gem 'rake'
gem 'faker', '~> 1.0'
gem 'sqlite3', '~> 1.3.3'
gem 'pg', '~> 1.0'
gem 'mysql2', '~> 0.5.2'
gem 'pry', '~> 0.12.2'
gem 'byebug'

git 'https://github.com/rails/rails.git', :branch => '5-2-stable' do
gem 'activesupport'
gem 'activemodel'
gem 'activerecord', require: false
gem 'actionpack'
end

group :test do
gem 'machinist', '~> 1.0.6'
gem 'rspec', '~> 3'
gem 'simplecov', :require => false
end

group :rubocop do
# RuboCop 0.81.0 is the last version which supports Ruby 2.3.
# Once Ransack required_ruby_version is bumped, RuboCop version can be bumped.
# https://github.com/rubocop-hq/rubocop/pull/7869
gem 'rubocop', '=0.81.0', require: false
end



33 changes: 33 additions & 0 deletions gemfiles/Gemfile.6-0-stable
@@ -0,0 +1,33 @@
source 'https://rubygems.org'
gemspec path: "../"

gem 'rake'
gem 'faker', '~> 1.0'
gem 'sqlite3', '~> 1.4.1'
gem 'pg', '~> 1.0'
gem 'mysql2', '~> 0.5.2'
gem 'pry', '~> 0.12.2'
gem 'byebug'

git 'https://github.com/rails/rails.git', :branch => '6-0-stable' do
gem 'activesupport'
gem 'activemodel'
gem 'activerecord', require: false
gem 'actionpack'
end

group :test do
gem 'machinist', '~> 1.0.6'
gem 'rspec', '~> 3'
gem 'simplecov', :require => false
end

group :rubocop do
# RuboCop 0.81.0 is the last version which supports Ruby 2.3.
# Once Ransack required_ruby_version is bumped, RuboCop version can be bumped.
# https://github.com/rubocop-hq/rubocop/pull/7869
gem 'rubocop', '=0.81.0', require: false
end



33 changes: 33 additions & 0 deletions gemfiles/Gemfile.v5.2.4
@@ -0,0 +1,33 @@
source 'https://rubygems.org'
gemspec path: "../"

gem 'rake'
gem 'faker', '~> 1.0'
gem 'sqlite3', '~> 1.3.3'
gem 'pg', '~> 1.0'
gem 'mysql2', '~> 0.5.2'
gem 'pry', '~> 0.12.2'
gem 'byebug'

git 'https://github.com/rails/rails.git', :tag => 'v5.2.4' do
gem 'activesupport'
gem 'activemodel'
gem 'activerecord', require: false
gem 'actionpack'
end

group :test do
gem 'machinist', '~> 1.0.6'
gem 'rspec', '~> 3'
gem 'simplecov', :require => false
end

group :rubocop do
# RuboCop 0.81.0 is the last version which supports Ruby 2.3.
# Once Ransack required_ruby_version is bumped, RuboCop version can be bumped.
# https://github.com/rubocop-hq/rubocop/pull/7869
gem 'rubocop', '=0.81.0', require: false
end



33 changes: 33 additions & 0 deletions gemfiles/Gemfile.v6.0.3
@@ -0,0 +1,33 @@
source 'https://rubygems.org'
gemspec path: "../"

gem 'rake'
gem 'faker', '~> 1.0'
gem 'sqlite3', '~> 1.4.1'
gem 'pg', '~> 1.0'
gem 'mysql2', '~> 0.5.2'
gem 'pry', '~> 0.12.2'
gem 'byebug'

git 'https://github.com/rails/rails.git', :tag => 'v6.0.3' do
gem 'activesupport'
gem 'activemodel'
gem 'activerecord', require: false
gem 'actionpack'
end

group :test do
gem 'machinist', '~> 1.0.6'
gem 'rspec', '~> 3'
gem 'simplecov', :require => false
end

group :rubocop do
# RuboCop 0.81.0 is the last version which supports Ruby 2.3.
# Once Ransack required_ruby_version is bumped, RuboCop version can be bumped.
# https://github.com/rubocop-hq/rubocop/pull/7869
gem 'rubocop', '=0.81.0', require: false
end



33 changes: 33 additions & 0 deletions gemfiles/Gemfile.v6.1.0
@@ -0,0 +1,33 @@
source 'https://rubygems.org'
gemspec path: "../"

gem 'rake'
gem 'faker', '~> 1.0'
gem 'sqlite3', '~> 1.4.1'
gem 'pg', '~> 1.0'
gem 'mysql2', '~> 0.5.2'
gem 'pry', '~> 0.12.2'
gem 'byebug'

git 'https://github.com/rails/rails.git', :tag => 'v6.1.0' do
gem 'activesupport'
gem 'activemodel'
gem 'activerecord', require: false
gem 'actionpack'
end

group :test do
gem 'machinist', '~> 1.0.6'
gem 'rspec', '~> 3'
gem 'simplecov', :require => false
end

group :rubocop do
# RuboCop 0.81.0 is the last version which supports Ruby 2.3.
# Once Ransack required_ruby_version is bumped, RuboCop version can be bumped.
# https://github.com/rubocop-hq/rubocop/pull/7869
gem 'rubocop', '=0.81.0', require: false
end



0 comments on commit 0ea3b0f

Please sign in to comment.