Exclude versions

mission-met · Jul 18, 2024 · e52323b · e52323b
1 parent 299165f
commit e52323b
Show file tree

Hide file tree

Showing 6 changed files with 37 additions and 13 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -41,25 +41,49 @@ jobs:
       matrix:
         ruby: ["2.7.8", "3.0.7", "3.1.6", "3.2.4", "3.3.4"]
         node: ["14"]
-        gemfile:
-          - spec/gemfiles/rails_6_0.gemfile
-          - spec/gemfiles/rails_6_1.gemfile
-          - spec/gemfiles/rails_7_0.gemfile
-          - spec/gemfiles/rails_7_2.gemfile
-          - spec/gemfiles/rails_main.gemfile
-          # - spec/gemfiles/rubocop.gemfile
-          # - spec/gemfiles/i18n-tasks.gemfile
+        rails_version: ["6.0", "6.1", "7.0", "7.2", "edge"] # "rubocop", "i18n-tasks"
         # db: [sqlite3, postgres, mysql]
         db: [sqlite3]
         exclude:
+          # Not supported versions
           - ruby: 2.7.8
-            gemfile: spec/gemfiles/rails_7_2.gemfile
+            rails_version: 7.2
           - ruby: 3.0.7
-            gemfile: spec/gemfiles/rails_7_2.gemfile
+            rails_version: 7.2
           - ruby: 2.7.8
-            gemfile: spec/gemfiles/rails_main.gemfile
+            rails_version: edge
           - ruby: 3.0.7
-            gemfile: spec/gemfiles/rails_main.gemfile
+            rails_version: edge
+
+          # Logger Issues
+          - ruby: 3.3.4
+            rails_version: edge
+          - ruby: 3.3.4
+            rails_version: 7.2
+          - ruby: 3.2.4
+            rails_version: edge
+          - ruby: 3.2.4
+            rails_version: 7.2
+          - ruby: 3.1.6
+            rails_version: edge
+          - ruby: 3.1.6
+            rails_version: 7.2
+
+          # Psych issues
+          - ruby: 3.3.4
+            rails_version: 6.1
+          - ruby: 3.3.4
+            rails_version: 6.0
+          - ruby: 3.2.4
+            rails_version: 6.1
+          - ruby: 3.2.4
+            rails_version: 6.0
+          - ruby: 3.1.6
+            rails_version: 6.1
+          - ruby: 3.1.6
+            rails_version: 6.0
+
+
         # include:
         #   - ruby: 2.7
         #     rails: rubocop
@@ -72,7 +96,7 @@ jobs:
       RAILS_ENV: test
       COVERAGE: 1
       FERRUM_DEFAULT_TIMEOUT: 20
-      BUNDLE_GEMFILE: ${{ matrix.gemfile }}
+      BUNDLE_GEMFILE: "spec/gemfiles/rails_${{ matrix.rails_version }}.gemfile"
       DB_USERNAME: thredded
       DB_PASSWORD: thredded
     steps:

diff --git a/spec/gemfiles/rails_6_0.gemfile → spec/gemfiles/rails_6.0.gemfile b/spec/gemfiles/rails_6_0.gemfile → spec/gemfiles/rails_6.0.gemfile
diff --git a/spec/gemfiles/rails_6_1.gemfile → spec/gemfiles/rails_6.1.gemfile b/spec/gemfiles/rails_6_1.gemfile → spec/gemfiles/rails_6.1.gemfile
diff --git a/spec/gemfiles/rails_7_0.gemfile → spec/gemfiles/rails_7.0.gemfile b/spec/gemfiles/rails_7_0.gemfile → spec/gemfiles/rails_7.0.gemfile
diff --git a/spec/gemfiles/rails_7_2.gemfile → spec/gemfiles/rails_7.2.gemfile b/spec/gemfiles/rails_7_2.gemfile → spec/gemfiles/rails_7.2.gemfile
diff --git a/spec/gemfiles/rails_main.gemfile → spec/gemfiles/rails_edge.gemfile b/spec/gemfiles/rails_main.gemfile → spec/gemfiles/rails_edge.gemfile