From e8777605f5b6921ac5aaddc6950acd0b20b2ab6f Mon Sep 17 00:00:00 2001 From: Abdelkader Boudih Date: Tue, 16 Jan 2024 17:14:39 +0100 Subject: [PATCH] chore: Update gemfiles and CI settings for newer Rails versions 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. --- .github/workflows/ci.yml | 9 +++------ .gitignore | 3 +++ Appraisals | 11 +++++------ gemfiles/rails_5.2.gemfile | 17 ----------------- gemfiles/rails_6.0.gemfile | 8 -------- gemfiles/rails_6.1.gemfile | 8 -------- gemfiles/rails_7.0.gemfile | 15 +-------------- gemfiles/rails_7.1.gemfile | 10 ++++++++++ gems.rb | 6 ++++++ trailblazer-rails.gemspec | 4 +--- 10 files changed, 29 insertions(+), 62 deletions(-) delete mode 100644 gemfiles/rails_5.2.gemfile create mode 100644 gemfiles/rails_7.1.gemfile create mode 100644 gems.rb diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a5bd605..7d24340 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -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 }} diff --git a/.gitignore b/.gitignore index 2903abf..d927810 100644 --- a/.gitignore +++ b/.gitignore @@ -14,3 +14,6 @@ test/**/Gemfile.lock *.iml *.sqlite3 .tool-versions +gems.locked +gemfiles/*.lock + diff --git a/Appraisals b/Appraisals index 1608e44..8f92536 100644 --- a/Appraisals +++ b/Appraisals @@ -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 \ No newline at end of file +appraise "rails-7.1" do + gem "actionpack", "~> 7.0.0" + gem "activerecord", "~> 7.0.0" + gem "sqlite3", "~> 1.4.0" +end diff --git a/gemfiles/rails_5.2.gemfile b/gemfiles/rails_5.2.gemfile deleted file mode 100644 index 73ef0ce..0000000 --- a/gemfiles/rails_5.2.gemfile +++ /dev/null @@ -1,17 +0,0 @@ -# This file was generated by Appraisal - -source "https://rubygems.org" - -gem "cells-erb" -gem "cells-rails" -gem "reform-rails" -gem "trailblazer" -gem "trailblazer-cells" -gem "trailblazer-loader" -gem "sqlite3", "~> 1.3.8" -gem "minitest-capybara" -gem "appraisal" -gem "actionpack", "~> 5.2.0" -gem "activerecord", "~> 5.2.0" - -gemspec path: "../" diff --git a/gemfiles/rails_6.0.gemfile b/gemfiles/rails_6.0.gemfile index 1cb0f81..df1534b 100644 --- a/gemfiles/rails_6.0.gemfile +++ b/gemfiles/rails_6.0.gemfile @@ -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" diff --git a/gemfiles/rails_6.1.gemfile b/gemfiles/rails_6.1.gemfile index 2cc837f..78191ba 100644 --- a/gemfiles/rails_6.1.gemfile +++ b/gemfiles/rails_6.1.gemfile @@ -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" diff --git a/gemfiles/rails_7.0.gemfile b/gemfiles/rails_7.0.gemfile index e774ea3..99f7ca0 100644 --- a/gemfiles/rails_7.0.gemfile +++ b/gemfiles/rails_7.0.gemfile @@ -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: "../" diff --git a/gemfiles/rails_7.1.gemfile b/gemfiles/rails_7.1.gemfile new file mode 100644 index 0000000..99f7ca0 --- /dev/null +++ b/gemfiles/rails_7.1.gemfile @@ -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: "../" diff --git a/gems.rb b/gems.rb new file mode 100644 index 0000000..efdeb66 --- /dev/null +++ b/gems.rb @@ -0,0 +1,6 @@ +# frozen_string_literal: true + +source 'https://rubygems.org' +gemspec + +gem 'appraisal' diff --git a/trailblazer-rails.gemspec b/trailblazer-rails.gemspec index 980156c..3d637e6 100644 --- a/trailblazer-rails.gemspec +++ b/trailblazer-rails.gemspec @@ -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"