Skip to content

Commit

Permalink
chore: Update gemfiles and CI settings for newer Rails versions
Browse files Browse the repository at this point in the history
This commit removes support for Rails 5.2 and updates gemfiles for Rails 6.0, 6.1, and 7.0. It also adds support for Rails 7.1. The CI settings are updated to reflect these changes, now testing on newer Ruby versions and using updated versions of Github Actions.
  • Loading branch information
seuros committed Jan 16, 2024
1 parent 2ecb2c6 commit e877760
Show file tree
Hide file tree
Showing 10 changed files with 29 additions and 62 deletions.
9 changes: 3 additions & 6 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,20 +11,17 @@ jobs:
strategy:
fail-fast: false
matrix:
ruby: [2.7, '3.0']
ruby: ['3.0', '3.1', '3.2', '3.3']
gemfile:
- rails_7.1
- rails_7.0
- rails_6.1
- rails_6.0
- rails_5.2
exclude:
- ruby: '3.0'
gemfile: rails_5.2
runs-on: ubuntu-latest
env:
BUNDLE_GEMFILE: ${{ github.workspace }}/gemfiles/${{ matrix.gemfile }}.gemfile
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
- uses: ruby/setup-ruby@v1
with:
ruby-version: ${{ matrix.ruby }}
Expand Down
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -14,3 +14,6 @@ test/**/Gemfile.lock
*.iml
*.sqlite3
.tool-versions
gems.locked
gemfiles/*.lock

11 changes: 5 additions & 6 deletions Appraisals
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,8 @@ appraise "rails-7.0" do
gem "activerecord", "~> 7.0.0"
gem "sqlite3", "~> 1.4.0"
end

appraise "rails-5.2" do
gem "actionpack", "~> 5.2.0"
gem "activerecord", "~> 5.2.0"
gem "sqlite3", "~> 1.3.8"
end
appraise "rails-7.1" do
gem "actionpack", "~> 7.0.0"
gem "activerecord", "~> 7.0.0"
gem "sqlite3", "~> 1.4.0"
end
17 changes: 0 additions & 17 deletions gemfiles/rails_5.2.gemfile

This file was deleted.

8 changes: 0 additions & 8 deletions gemfiles/rails_6.0.gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,6 @@

source "https://rubygems.org"

gem "cells-erb"
gem "cells-rails"
gem "reform-rails"
gem "trailblazer"
gem "trailblazer-cells"
gem "trailblazer-loader"
gem "sqlite3"
gem "minitest-capybara"
gem "appraisal"
gem "actionpack", "~> 6.0.0"
gem "activerecord", "~> 6.0.0"
Expand Down
8 changes: 0 additions & 8 deletions gemfiles/rails_6.1.gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,6 @@

source "https://rubygems.org"

gem "cells-erb"
gem "cells-rails"
gem "reform-rails"
gem "trailblazer"
gem "trailblazer-cells"
gem "trailblazer-loader"
gem "sqlite3"
gem "minitest-capybara"
gem "appraisal"
gem "actionpack", "~> 6.1.0"
gem "activerecord", "~> 6.1.0"
Expand Down
15 changes: 1 addition & 14 deletions gemfiles/rails_7.0.gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,22 +2,9 @@

source "https://rubygems.org"

gem "cells-erb"
gem "cells-rails"
gem "reform-rails"
gem "trailblazer"
gem "trailblazer-cells"
gem "sqlite3", "~> 1.4.0"
gem "minitest-capybara"
gem "appraisal"
gem "actionpack", "~> 7.0.0"
gem "activerecord", "~> 7.0.0"

# gem "trailblazer-macro", path: "../../trailblazer-macro"
# gem "trailblazer-macro-contract", path: "../../trailblazer-macro-contract"
# gem "trailblazer-activity", path: "../../trailblazer-activity"
# gem "trailblazer-operation", path: "../../trailblazer-operation"
# gem "trailblazer-developer", path: "../../trailblazer-developer"
# gem "trailblazer-activity-dsl-linear", path: "../../trailblazer-activity-dsl-linear"
gem "sqlite3", "~> 1.4.0"

gemspec path: "../"
10 changes: 10 additions & 0 deletions gemfiles/rails_7.1.gemfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
# This file was generated by Appraisal

source "https://rubygems.org"

gem "appraisal"
gem "actionpack", "~> 7.0.0"
gem "activerecord", "~> 7.0.0"
gem "sqlite3", "~> 1.4.0"

gemspec path: "../"
6 changes: 6 additions & 0 deletions gems.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
# frozen_string_literal: true

source 'https://rubygems.org'
gemspec

gem 'appraisal'
4 changes: 1 addition & 3 deletions trailblazer-rails.gemspec
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
lib = File.expand_path("lib", __dir__)
$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
require "trailblazer/rails/version"
require_relative "lib/trailblazer/rails/version"

Gem::Specification.new do |spec|
spec.name = "trailblazer-rails"
Expand Down

0 comments on commit e877760

Please sign in to comment.