Finish Setting Up CI

westonganger · Apr 25, 2021 · ac414c8 · ac414c8
1 parent a228941
commit ac414c8
Show file tree

Hide file tree

Showing 8 changed files with 19 additions and 60 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -13,24 +13,18 @@ jobs:
       matrix:
         include:
           ### TEST ALL RUBY VERSIONS, USE DEFAULT GEMFILE
-          - ruby: 2.3
-          - ruby: 2.4
           - ruby: 2.5
           - ruby: 2.6
           - ruby: 2.7
           - ruby: 3.0
 
           ### RAILS VERSION TESTING
           - ruby: 2.6
-            gemfile: gemfiles/rails_5.0.sqlite3.gemfile
+            gemfile: gemfiles/ar_5.2_pt_12.0.gemfile
           - ruby: 2.6
-            gemfile: gemfiles/rails_5.1.sqlite3.gemfile
+            gemfile: gemfiles/ar_6.0_pt_12.0.gemfile
           - ruby: 2.6
-            gemfile: gemfiles/rails_5.2.sqlite3.gemfile
-          - ruby: 2.6
-            gemfile: gemfiles/rails_6.0.sqlite3.gemfile
-          - ruby: 2.6
-            gemfile: gemfiles/rails_6.1.sqlite3.gemfile
+            gemfile: gemfiles/ar_6.1_pt_12.0.gemfile
 
     env:
       BUNDLE_GEMFILE: "${{ matrix.gemfile }}"
@@ -73,15 +67,11 @@ jobs:
           ### RAILS VERSION TESTING
           ### DONT WORRY ABOUT TESTING ALL RUBY VERSIONS. THIS IS COVERED IN THE SQLITE3 TESTS
           - ruby: 2.6
-            gemfile: gemfiles/rails_5.0.mysql2.gemfile
-          - ruby: 2.6
-            gemfile: gemfiles/rails_5.1.mysql2.gemfile
+            gemfile: gemfiles/ar_5.2_pt_12.0.gemfile
           - ruby: 2.6
-            gemfile: gemfiles/rails_5.2.mysql2.gemfile
+            gemfile: gemfiles/ar_6.0_pt_12.0.gemfile
           - ruby: 2.6
-            gemfile: gemfiles/rails_6.0.mysql2.gemfile
-          - ruby: 2.6
-            gemfile: gemfiles/rails_6.1.mysql2.gemfile
+            gemfile: gemfiles/ar_6.1_pt_12.0.gemfile
 
     env:
       BUNDLE_GEMFILE: "${{ matrix.gemfile }}"
@@ -102,7 +92,7 @@ jobs:
 
     - name: Run tests
       env:
-        DATABASE_URL: mysql2://root:[email protected]:3306/test
+        DATABASE_URL: //root:[email protected]:3306/test
         RAILS_ENV: test
       run: |
         #bundle exec rake db:test:prepare
@@ -127,15 +117,11 @@ jobs:
           ### RAILS VERSION TESTING
           ### DONT WORRY ABOUT TESTING ALL RUBY VERSIONS. THIS IS COVERED IN THE SQLITE3 TESTS
           - ruby: 2.6
-            gemfile: gemfiles/rails_5.0.pg.gemfile
-          - ruby: 2.6
-            gemfile: gemfiles/rails_5.1.pg.gemfile
-          - ruby: 2.6
-            gemfile: gemfiles/rails_5.2.pg.gemfile
+            gemfile: gemfiles/ar_5.2_pt_12.0.gemfile
           - ruby: 2.6
-            gemfile: gemfiles/rails_6.0.pg.gemfile
+            gemfile: gemfiles/ar_6.0_pt_12.0.gemfile
           - ruby: 2.6
-            gemfile: gemfiles/rails_6.1.pg.gemfile
+            gemfile: gemfiles/ar_6.1_pt_12.0.gemfile
 
     env:
       BUNDLE_GEMFILE: "${{ matrix.gemfile }}"

diff --git a/Appraisals b/Appraisals
@@ -6,23 +6,23 @@
 # > the version from the appraisal takes precedence.
 # > https://github.com/thoughtbot/appraisal
 
+### WHEN UPDATING THESE VERSIONS DONT FORGOT TO UPDATE .github/workflows/test.yml
 pt_versions = [
   '~>12.0', 
-  'master',
 ]
 
 ar_versions = [
   [
-    '~>5.2.0', 
+    '~>5.2', 
     pt_versions,
   ],
   [
-    '~>6.0.0', 
-    pt_versions.select{|x| x.sub('~>', '').to_f >= 10 || x == 'master' },
+    '~>6.0', 
+    pt_versions,
   ],
   [
-    '~>6.1.0', 
-    pt_versions.select{|x| x.sub('~>', '').to_f >= 10 || x == 'master' },
+    '~>6.1', 
+    pt_versions,
   ],
 ]
 

diff --git a/gemfiles/ar_5.2.0_pt_master.gemfile b/gemfiles/ar_5.2.0_pt_master.gemfile
diff --git a/gemfiles/ar_5.2.0_pt_12.0.gemfile → gemfiles/ar_5.2_pt_12.0.gemfile b/gemfiles/ar_5.2.0_pt_12.0.gemfile → gemfiles/ar_5.2_pt_12.0.gemfile
@@ -4,6 +4,6 @@ source "https://rubygems.org"
 
 gem "rails-controller-testing"
 gem "paper_trail", "~>12.0"
-gem "activerecord", "~>5.2.0"
+gem "activerecord", "~>5.2"
 
 gemspec path: "../"
diff --git a/gemfiles/ar_6.0.0_pt_master.gemfile b/gemfiles/ar_6.0.0_pt_master.gemfile
diff --git a/gemfiles/ar_6.1.0_pt_12.0.gemfile → gemfiles/ar_6.0_pt_12.0.gemfile b/gemfiles/ar_6.1.0_pt_12.0.gemfile → gemfiles/ar_6.0_pt_12.0.gemfile
@@ -4,6 +4,6 @@ source "https://rubygems.org"
 
 gem "rails-controller-testing"
 gem "paper_trail", "~>12.0"
-gem "activerecord", "~>6.1.0"
+gem "activerecord", "~>6.0"
 
 gemspec path: "../"
diff --git a/gemfiles/ar_6.1.0_pt_master.gemfile b/gemfiles/ar_6.1.0_pt_master.gemfile
diff --git a/gemfiles/ar_6.0.0_pt_12.0.gemfile → gemfiles/ar_6.1_pt_12.0.gemfile b/gemfiles/ar_6.0.0_pt_12.0.gemfile → gemfiles/ar_6.1_pt_12.0.gemfile
@@ -4,6 +4,6 @@ source "https://rubygems.org"
 
 gem "rails-controller-testing"
 gem "paper_trail", "~>12.0"
-gem "activerecord", "~>6.0.0"
+gem "activerecord", "~>6.1"
 
 gemspec path: "../"