Merge pull request #112 from PedroAugustoRamalhoDuarte/fix-workflows

Upgrade CI to rails 7.1 and ruby 3
inertiajs · Apr 28, 2024 · e2e2d5b · e2e2d5b
2 parents 684ac4d + 849824c
commit e2e2d5b
Show file tree

Hide file tree

Showing 9 changed files with 10 additions and 68 deletions.
diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml
@@ -7,17 +7,14 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby: [2.6, 2.7]
-        rails: ['5.1', '5.2', '6.0', '6.1', '7.0']
-        exclude:
-          - rails: '7.0'
-            ruby: 2.6
+        ruby: ['3.1', '3.2', '3.3']
+        rails: ['6.1', '7.0', '7.1']
 
     runs-on: ubuntu-latest
     name: Test against Ruby ${{ matrix.ruby }} / Rails ${{ matrix.rails }}
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
 
       - name: Setup System
         run: sudo apt-get install libsqlite3-dev
@@ -26,14 +23,11 @@ jobs:
         uses: ruby/setup-ruby@v1
         with:
           ruby-version: ${{ matrix.ruby }}
-
-      - name: Install gems
+          bundler-cache: true
         env:
-          MATRIX_RAILS_VERSION: ${{ matrix.rails }}
-        run: |
-          export BUNDLE_GEMFILE="${GITHUB_WORKSPACE}/gemfiles/rails_${MATRIX_RAILS_VERSION}.gemfile"
-          gem install bundler
-          bundle install --jobs 4 --retry 3
+          RAILS_VERSION:  ${{ matrix.rails }}
 
       - name: Run tests
         run: bundle exec rake
+        env:
+          RAILS_VERSION: ${{ matrix.rails }}
diff --git a/Appraisals b/Appraisals
diff --git a/Gemfile b/Gemfile
@@ -2,3 +2,6 @@ source "https://rubygems.org"
 
 # Specify your gem's dependencies in inertia-rails.gemspec
 gemspec
+
+version = ENV["RAILS_VERSION"] || "7.1"
+gem "rails", "~> #{version}.0"
diff --git a/gemfiles/rails_5.1.gemfile b/gemfiles/rails_5.1.gemfile
diff --git a/gemfiles/rails_5.2.gemfile b/gemfiles/rails_5.2.gemfile
diff --git a/gemfiles/rails_6.0.gemfile b/gemfiles/rails_6.0.gemfile
diff --git a/gemfiles/rails_6.1.gemfile b/gemfiles/rails_6.1.gemfile
diff --git a/gemfiles/rails_7.0.gemfile b/gemfiles/rails_7.0.gemfile
diff --git a/inertia_rails.gemspec b/inertia_rails.gemspec
@@ -32,7 +32,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rspec-rails", "~> 4.0"
   spec.add_development_dependency "rails-controller-testing"
   spec.add_development_dependency "sqlite3"
-  spec.add_development_dependency "appraisal"
   spec.add_development_dependency "responders"
   spec.add_development_dependency "debug"
 end