Merge pull request rails#191 from casperisfine/github-actions

Migrate to GitHub Actions and revamp tested versions
endangurura · May 30, 2022 · 9198a95 · 9198a95
2 parents 1bd9897 + 23ae45c
commit 9198a95
Show file tree

Hide file tree

Showing 8 changed files with 36 additions and 69 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -0,0 +1,24 @@
+name: CI
+on: [push, pull_request]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        ruby: ['2.7', '3.0', '3.1']
+        rails: ['6.1', '7.0', 'edge']
+    env:
+      BUNDLE_GEMFILE: gemfiles/rails_${{ matrix.rails }}.gemfile
+    name: Ruby ${{ matrix.ruby }} / Rails ${{ matrix.rails }}
+    steps:
+      - name: Check out code
+        uses: actions/checkout@v2
+      - name: Set up Ruby ${{ matrix.ruby }}
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+          bundler-cache: true
+      - name: Ruby Tests
+        run: bundle exec rake
diff --git a/.travis.yml b/.travis.yml
diff --git a/activerecord-session_store.gemspec b/activerecord-session_store.gemspec
@@ -19,9 +19,9 @@ Gem::Specification.new do |s|
   s.extra_rdoc_files = %w( README.md )
   s.rdoc_options.concat ['--main',  'README.md']
 
-  s.add_dependency('activerecord', '>= 5.2.4.1')
-  s.add_dependency('actionpack', '>= 5.2.4.1')
-  s.add_dependency('railties', '>= 5.2.4.1')
+  s.add_dependency('activerecord', '>= 6.1')
+  s.add_dependency('actionpack', '>= 6.1')
+  s.add_dependency('railties', '>= 6.1')
   s.add_dependency('rack', '>= 2.0.8', '< 3')
   s.add_dependency('multi_json', '~> 1.11', '>= 1.11.2')
 

diff --git a/gemfiles/rails_5_2.gemfile b/gemfiles/rails_5_2.gemfile
diff --git a/gemfiles/rails_6_1.gemfile → gemfiles/rails_6.1.gemfile b/gemfiles/rails_6_1.gemfile → gemfiles/rails_6.1.gemfile
diff --git a/gemfiles/rails_6_0.gemfile b/gemfiles/rails_6_0.gemfile
diff --git a/gemfiles/rails_7.0.gemfile b/gemfiles/rails_7.0.gemfile
@@ -0,0 +1,7 @@
+source "https://rubygems.org"
+
+gem "actionpack", github: "rails/rails", branch: "7-0-stable"
+gem "activerecord", github: "rails/rails", branch: "7-0-stable"
+gem "railties", github: "rails/rails", branch: "7-0-stable"
+
+gemspec :path => "../"
diff --git a/gemfiles/rails_edge.gemfile b/gemfiles/rails_edge.gemfile
@@ -6,6 +6,7 @@ git "https://github.com/rails/rails.git", :branch => "main" do
   gem "railties"
 end
 
-gem "rack", :git => "https://github.com/rack/rack.git", :branch => "master"
+gem "rack", :git => "https://github.com/rack/rack.git", :branch => "main"
+gem "rack-session", :git => "https://github.com/rack/rack-session.git", :branch => "main"
 
 gemspec :path => "../"