Skip to content

Commit

Permalink
Refractor CI, Add Rails 7.1 to CI
Browse files Browse the repository at this point in the history
  • Loading branch information
westonganger committed Oct 17, 2023
1 parent 08d0ea2 commit dc58465
Show file tree
Hide file tree
Showing 11 changed files with 49 additions and 141 deletions.
66 changes: 35 additions & 31 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
@@ -1,42 +1,43 @@
name: Tests
on:
push:
branches: ['*']
branches: ['master']
pull_request:
branches: ['*']

jobs:
test_sqlite:
runs-on: ubuntu-20.04
test:
runs-on: ubuntu-latest

env:
RAILS_ENV: test

strategy:
fail-fast: false
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" ### must be quoted otherwise will be treated as "3" which will resolve to latest 3.x version
- ruby: 3.1

### RAILS VERSION TESTING
- ruby: 2.6
gemfile: gemfiles/rails_5.0.sqlite3.gemfile
- ruby: 2.6
gemfile: gemfiles/rails_5.1.sqlite3.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
### TEST RUBY VERSIONS
- ruby: "2.5"
- ruby: "2.6"
- ruby: "2.7"
- ruby: "3.0"
- ruby: "3.1"
gemfile: gemfiles/rails_7.0.sqlite3.gemfile

env:
BUNDLE_GEMFILE: "${{ matrix.gemfile }}"
- ruby: "3.2"
### TEST RAILS VERSIONS
- ruby: "2.6"
env:
RAILS_VERSION: "5.2"
- ruby: "2.6"
env:
RAILS_VERSION: "6.0"
- ruby: "2.6"
env:
RAILS_VERSION: "6.1"
- ruby: "3.2"
env:
RAILS_VERSION: "7.0"
- ruby: "3.2"
env:
RAILS_VERSION: "7.1"

steps:
- uses: actions/checkout@v3
Expand All @@ -45,8 +46,11 @@ jobs:
uses: ruby/setup-ruby@v1
with:
ruby-version: "${{ matrix.ruby }}"
bundler-cache: true
bundler-cache: false ### not compatible with ENV-style Gemfile

- name: Run tests
- name: Run test
run: |
bundle exec rake
bundle install
bundle exec rake db:create
bundle exec rake db:migrate
bundle exec rake test
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
log/*.log
pkg/
test/dummy_app/db/*.sqlite3
test/dummy_app/db/*.sqlite3*
test/dummy_app/log/*.log
test/dummy_app/tmp/
Gemfile.lock
Expand Down
42 changes: 0 additions & 42 deletions Appraisals

This file was deleted.

13 changes: 13 additions & 0 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -1,3 +1,16 @@
source "http://rubygems.org"

gemspec

def get_env(name)
(ENV[name] && !ENV[name].empty?) ? ENV[name] : nil
end

gem 'rails', get_env("RAILS_VERSION")

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

if RUBY_VERSION.to_f > 3.1
gem "matrix"
end
10 changes: 0 additions & 10 deletions gemfiles/rails_5.0.sqlite3.gemfile

This file was deleted.

10 changes: 0 additions & 10 deletions gemfiles/rails_5.1.sqlite3.gemfile

This file was deleted.

10 changes: 0 additions & 10 deletions gemfiles/rails_5.2.sqlite3.gemfile

This file was deleted.

10 changes: 0 additions & 10 deletions gemfiles/rails_6.0.sqlite3.gemfile

This file was deleted.

10 changes: 0 additions & 10 deletions gemfiles/rails_6.1.sqlite3.gemfile

This file was deleted.

10 changes: 0 additions & 10 deletions gemfiles/rails_7.0.sqlite3.gemfile

This file was deleted.

8 changes: 0 additions & 8 deletions prawn-rails.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -24,16 +24,8 @@ Gem::Specification.new do |s|
s.add_development_dependency "pdf-reader"
s.add_development_dependency 'rake'
s.add_development_dependency 'minitest'
s.add_development_dependency 'bundler'
s.add_development_dependency "rails"
s.add_development_dependency 'sqlite3'
s.add_development_dependency 'appraisal'
s.add_development_dependency 'pry'

if RUBY_VERSION.to_f >= 3.1
s.add_development_dependency 'matrix'
end

if RUBY_VERSION.to_f >= 2.4
s.add_development_dependency 'warning'
end
Expand Down

0 comments on commit dc58465

Please sign in to comment.