From a39c589655b277a3c97469ef184af6a03207388b Mon Sep 17 00:00:00 2001
From: Weston Ganger <weston@westonganger.com>
Date: Tue, 20 Aug 2024 13:46:18 -0700
Subject: [PATCH] Fix CI env variables

---
 .github/workflows/test.yml | 24 ++++++++++--------------
 Gemfile                    |  2 +-
 2 files changed, 11 insertions(+), 15 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 19bbeda..51b6f57 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -20,28 +20,23 @@ jobs:
           - ruby: "2.6"
           - ruby: "2.7"
           - ruby: "3.0"
+            db_gem_version: "~> 1.4" # fixes sqlite3 gem dependency issue
           - ruby: "3.1"
           - ruby: "3.2"
           - ruby: "3.3"
           ### TEST RAILS VERSIONS
           - ruby: "2.6"
-            env:
-              RAILS_VERSION: "5.2"
+            rails_version: "~> 5.2"
           - ruby: "2.6"
-            env:
-              RAILS_VERSION: "6.0"
+            rails_version: "~> 6.0"
           - ruby: "2.6"
-            env:
-              RAILS_VERSION: "6.1"
+            rails_version: "~> 6.1"
           - ruby: "3.3"
-            env:
-              RAILS_VERSION: "7.0"
+            rails_version: "~> 7.0"
           - ruby: "3.3"
-            env:
-              RAILS_VERSION: "7.1"
+            rails_version: "~> 7.1"
           - ruby: "3.3"
-            env:
-              RAILS_VERSION: "7.2"
+            rails_version: ~> "7.2"
           ### TEST NON-DEFAULT DATABASES
           - ruby: "3.3"
             db_gem: "mysql2"
@@ -75,10 +70,11 @@ jobs:
           echo "DATABASE_URL=postgres://postgres:password@localhost:5432/test" >> "$GITHUB_ENV"
         fi
 
-    - name: Set env DB_GEM
-      if: ${{ matrix.db_gem }}
+    - name: Set env variables
       run: |
+        echo "RAILS_VERSION=${{ matrix.rails_version }}" >> "$GITHUB_ENV"
         echo "DB_GEM=${{ matrix.db_gem }}" >> "$GITHUB_ENV"
+        echo "DB_GEM_VERSION=${{ matrix.db_gem_version }}" >> "$GITHUB_ENV"
 
     - name: Install ruby
       uses: ruby/setup-ruby@v1
diff --git a/Gemfile b/Gemfile
index 4a9d41a..87c8b59 100644
--- a/Gemfile
+++ b/Gemfile
@@ -17,4 +17,4 @@ end
 gem 'rails', get_env("RAILS_VERSION")
 
 db_gem = get_env("DB_GEM") || "sqlite3"
-gem db_gem
+gem db_gem, get_env("DB_GEM_VERSION")