Skip to content
This repository has been archived by the owner on Aug 21, 2024. It is now read-only.

Commit

Permalink
Fix CI env variables
Browse files Browse the repository at this point in the history
  • Loading branch information
westonganger committed Aug 20, 2024
1 parent 90ba4b5 commit 2826a1e
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 16 deletions.
18 changes: 8 additions & 10 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,22 +20,19 @@ 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.1"
rails_version: "~> 5.1"
- 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"
### TEST NON-DEFAULT DATABASES
- ruby: "3.3"
db_gem: "mysql2"
Expand Down Expand Up @@ -69,10 +66,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
Expand Down
7 changes: 1 addition & 6 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,4 @@ end
gem 'rails', get_env("RAILS_VERSION")

db_gem = get_env("DB_GEM") || "sqlite3"

if db_gem == "sqlite3"
gem db_gem, "~> 1.4"
else
gem db_gem
end
gem db_gem, get_env("DB_GEM_VERSION")

0 comments on commit 2826a1e

Please sign in to comment.