From d2640b3c16e2aa61bb6cb727db16dcaaa08207b3 Mon Sep 17 00:00:00 2001
From: Matt Larraz <mlarraz@users.noreply.github.com>
Date: Tue, 5 Nov 2024 17:37:16 -0500
Subject: [PATCH] Ensure Rails versions are actually tested

---
 .../active-record-multi-tenant-tests.yml      | 30 +++++++++----------
 .rubocop.yml                                  |  1 +
 gemfiles/active_record_6.0.gemfile            | 11 +++++++
 gemfiles/active_record_6.1.gemfile            | 11 +++++++
 gemfiles/active_record_7.0.gemfile            | 11 +++++++
 gemfiles/active_record_7.1.gemfile            | 11 +++++++
 gemfiles/active_record_7.2.gemfile            | 11 +++++++
 gemfiles/active_record_8.0.gemfile            | 11 +++++++
 gemfiles/rails_6.0.gemfile                    | 11 +++++++
 gemfiles/rails_6.1.gemfile                    | 11 +++++++
 gemfiles/rails_7.0.gemfile                    | 11 +++++++
 gemfiles/rails_7.1.gemfile                    | 11 +++++++
 gemfiles/rails_7.2.gemfile                    | 11 +++++++
 gemfiles/rails_8.0.gemfile                    | 11 +++++++
 14 files changed, 148 insertions(+), 15 deletions(-)
 create mode 100644 gemfiles/active_record_6.0.gemfile
 create mode 100644 gemfiles/active_record_6.1.gemfile
 create mode 100644 gemfiles/active_record_7.0.gemfile
 create mode 100644 gemfiles/active_record_7.1.gemfile
 create mode 100644 gemfiles/active_record_7.2.gemfile
 create mode 100644 gemfiles/active_record_8.0.gemfile
 create mode 100644 gemfiles/rails_6.0.gemfile
 create mode 100644 gemfiles/rails_6.1.gemfile
 create mode 100644 gemfiles/rails_7.0.gemfile
 create mode 100644 gemfiles/rails_7.1.gemfile
 create mode 100644 gemfiles/rails_7.2.gemfile
 create mode 100644 gemfiles/rails_8.0.gemfile

diff --git a/.github/workflows/active-record-multi-tenant-tests.yml b/.github/workflows/active-record-multi-tenant-tests.yml
index 1a9d91b3..9684183f 100644
--- a/.github/workflows/active-record-multi-tenant-tests.yml
+++ b/.github/workflows/active-record-multi-tenant-tests.yml
@@ -16,7 +16,7 @@ jobs:
     steps:
       - uses: ruby/setup-ruby@v1
         with:
-          ruby-version: 3.2
+          ruby-version: ruby
           bundler-cache: true
       - uses: actions/checkout@v4
       - name: Rubocop static code analysis
@@ -49,26 +49,26 @@ jobs:
           - '3.2'
           - '3.3'
         appraisal:
-          - rails-6.0
-          - rails-6.1
-          - rails-7.0
-          - rails-7.1
-          - rails-7.2
-          - rails-8.0
-          - active-record-6.0
-          - active-record-6.1
-          - active-record-7.0
-          - active-record-7.1
-          - active-record-7.2
-          - active-record-8.0
+          - rails_6.0
+          - rails_6.1
+          - rails_7.0
+          - rails_7.1
+          - rails_7.2
+          - rails_8.0
+          - active_record_6.0
+          - active_record_6.1
+          - active_record_7.0
+          - active_record_7.1
+          - active_record_7.2
+          - active_record_8.0
         citus_version:
           - '10'
           - '11'
           - '12'
 
-    name: Ruby ${{ matrix.ruby }}/${{ matrix.gemfile }} / Citus ${{ matrix.citus_version }}
+    name: Ruby ${{ matrix.ruby }} / ${{ matrix.appraisal }} / Citus ${{ matrix.citus_version }}
     env:
-       APPRAISAL: ${{ matrix.appraisal }}
+       BUNDLE_GEMFILE: gemfiles/${{ matrix.appraisal }}.gemfile
        CITUS_VERSION: ${{ matrix.citus_version }}
     steps:
       - uses: actions/checkout@v4
diff --git a/.rubocop.yml b/.rubocop.yml
index 646389e2..ab7b3cc0 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -3,6 +3,7 @@
 # Run RuboCop on all Ruby files, except those in `vendor` and `node_modules` directories
 AllCops:
   Exclude:
+    - 'gemfiles/**/*'
     - 'vendor/**/*'
     - 'node_modules/**/*'
     - 'Vagrantfile'
diff --git a/gemfiles/active_record_6.0.gemfile b/gemfiles/active_record_6.0.gemfile
new file mode 100644
index 00000000..46e55907
--- /dev/null
+++ b/gemfiles/active_record_6.0.gemfile
@@ -0,0 +1,11 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "appraisal"
+gem "rubocop", require: false, group: "test"
+gem "simplecov"
+gem "simplecov-cobertura"
+gem "activerecord", "~> 6.0.3"
+
+gemspec path: "../"
diff --git a/gemfiles/active_record_6.1.gemfile b/gemfiles/active_record_6.1.gemfile
new file mode 100644
index 00000000..d4ee518c
--- /dev/null
+++ b/gemfiles/active_record_6.1.gemfile
@@ -0,0 +1,11 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "appraisal"
+gem "rubocop", require: false, group: "test"
+gem "simplecov"
+gem "simplecov-cobertura"
+gem "activerecord", "~> 6.1.0"
+
+gemspec path: "../"
diff --git a/gemfiles/active_record_7.0.gemfile b/gemfiles/active_record_7.0.gemfile
new file mode 100644
index 00000000..6d763215
--- /dev/null
+++ b/gemfiles/active_record_7.0.gemfile
@@ -0,0 +1,11 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "appraisal"
+gem "rubocop", require: false, group: "test"
+gem "simplecov"
+gem "simplecov-cobertura"
+gem "activerecord", "~> 7.0.0"
+
+gemspec path: "../"
diff --git a/gemfiles/active_record_7.1.gemfile b/gemfiles/active_record_7.1.gemfile
new file mode 100644
index 00000000..a6cedac4
--- /dev/null
+++ b/gemfiles/active_record_7.1.gemfile
@@ -0,0 +1,11 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "appraisal"
+gem "rubocop", require: false, group: "test"
+gem "simplecov"
+gem "simplecov-cobertura"
+gem "activerecord", "~> 7.1.0"
+
+gemspec path: "../"
diff --git a/gemfiles/active_record_7.2.gemfile b/gemfiles/active_record_7.2.gemfile
new file mode 100644
index 00000000..0cec4887
--- /dev/null
+++ b/gemfiles/active_record_7.2.gemfile
@@ -0,0 +1,11 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "appraisal"
+gem "rubocop", require: false, group: "test"
+gem "simplecov"
+gem "simplecov-cobertura"
+gem "activerecord", "~> 7.2.0"
+
+gemspec path: "../"
diff --git a/gemfiles/active_record_8.0.gemfile b/gemfiles/active_record_8.0.gemfile
new file mode 100644
index 00000000..41a1dd19
--- /dev/null
+++ b/gemfiles/active_record_8.0.gemfile
@@ -0,0 +1,11 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "appraisal"
+gem "rubocop", require: false, group: "test"
+gem "simplecov"
+gem "simplecov-cobertura"
+gem "activerecord", "~> 8.0.0"
+
+gemspec path: "../"
diff --git a/gemfiles/rails_6.0.gemfile b/gemfiles/rails_6.0.gemfile
new file mode 100644
index 00000000..5dbde61c
--- /dev/null
+++ b/gemfiles/rails_6.0.gemfile
@@ -0,0 +1,11 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "appraisal"
+gem "rubocop", require: false, group: "test"
+gem "simplecov"
+gem "simplecov-cobertura"
+gem "rails", "~> 6.0.3"
+
+gemspec path: "../"
diff --git a/gemfiles/rails_6.1.gemfile b/gemfiles/rails_6.1.gemfile
new file mode 100644
index 00000000..e17503d8
--- /dev/null
+++ b/gemfiles/rails_6.1.gemfile
@@ -0,0 +1,11 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "appraisal"
+gem "rubocop", require: false, group: "test"
+gem "simplecov"
+gem "simplecov-cobertura"
+gem "rails", "~> 6.1.0"
+
+gemspec path: "../"
diff --git a/gemfiles/rails_7.0.gemfile b/gemfiles/rails_7.0.gemfile
new file mode 100644
index 00000000..6308c676
--- /dev/null
+++ b/gemfiles/rails_7.0.gemfile
@@ -0,0 +1,11 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "appraisal"
+gem "rubocop", require: false, group: "test"
+gem "simplecov"
+gem "simplecov-cobertura"
+gem "rails", "~> 7.0.0"
+
+gemspec path: "../"
diff --git a/gemfiles/rails_7.1.gemfile b/gemfiles/rails_7.1.gemfile
new file mode 100644
index 00000000..b729b6ed
--- /dev/null
+++ b/gemfiles/rails_7.1.gemfile
@@ -0,0 +1,11 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "appraisal"
+gem "rubocop", require: false, group: "test"
+gem "simplecov"
+gem "simplecov-cobertura"
+gem "rails", "~> 7.1.0"
+
+gemspec path: "../"
diff --git a/gemfiles/rails_7.2.gemfile b/gemfiles/rails_7.2.gemfile
new file mode 100644
index 00000000..5d2d4fe6
--- /dev/null
+++ b/gemfiles/rails_7.2.gemfile
@@ -0,0 +1,11 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "appraisal"
+gem "rubocop", require: false, group: "test"
+gem "simplecov"
+gem "simplecov-cobertura"
+gem "rails", "~> 7.2.0"
+
+gemspec path: "../"
diff --git a/gemfiles/rails_8.0.gemfile b/gemfiles/rails_8.0.gemfile
new file mode 100644
index 00000000..7eec0e3f
--- /dev/null
+++ b/gemfiles/rails_8.0.gemfile
@@ -0,0 +1,11 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "appraisal"
+gem "rubocop", require: false, group: "test"
+gem "simplecov"
+gem "simplecov-cobertura"
+gem "rails", "~> 8.0.0"
+
+gemspec path: "../"