From 23ae45c6df0b07e84c45c25b24a9c882d622e94d Mon Sep 17 00:00:00 2001
From: Jean Boussier <jean.boussier@gmail.com>
Date: Mon, 30 May 2022 12:30:51 +0200
Subject: [PATCH] Migrate to GitHub Actions and revamp tested versions

---
 .github/workflows/ci.yml                      | 24 +++++++++
 .travis.yml                                   | 51 -------------------
 activerecord-session_store.gemspec            |  6 +--
 gemfiles/rails_5_2.gemfile                    |  7 ---
 .../{rails_6_1.gemfile => rails_6.1.gemfile}  |  0
 gemfiles/rails_6_0.gemfile                    |  7 ---
 gemfiles/rails_7.0.gemfile                    |  7 +++
 gemfiles/rails_edge.gemfile                   |  3 +-
 8 files changed, 36 insertions(+), 69 deletions(-)
 create mode 100644 .github/workflows/ci.yml
 delete mode 100644 .travis.yml
 delete mode 100644 gemfiles/rails_5_2.gemfile
 rename gemfiles/{rails_6_1.gemfile => rails_6.1.gemfile} (100%)
 delete mode 100644 gemfiles/rails_6_0.gemfile
 create mode 100644 gemfiles/rails_7.0.gemfile

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
new file mode 100644
index 0000000..1ba234e
--- /dev/null
+++ 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
deleted file mode 100644
index 15204de..0000000
--- a/.travis.yml
+++ /dev/null
@@ -1,51 +0,0 @@
-language: ruby
-cache: bundler
-before_install: gem update bundler
-rvm:
-  - '2.2'
-  - '2.3'
-  - '2.4'
-  - '2.5'
-  - '2.6'
-  - '2.7'
-  - '3.0'
-  - ruby-head
-gemfile:
-  - gemfiles/rails_5_2.gemfile
-  - gemfiles/rails_6_0.gemfile
-  - gemfiles/rails_6_1.gemfile
-  - gemfiles/rails_edge.gemfile
-matrix:
-  fast_finish: true
-  exclude:
-    - rvm: '3.0'
-      gemfile: gemfiles/rails_5_2.gemfile
-    - rvm: 'ruby-head'
-      gemfile: gemfiles/rails_5_2.gemfile
-    - rvm: '2.2'
-      gemfile: gemfiles/rails_6_0.gemfile
-    - rvm: '2.3'
-      gemfile: gemfiles/rails_6_0.gemfile
-    - rvm: '2.4'
-      gemfile: gemfiles/rails_6_0.gemfile
-    - rvm: '2.2'
-      gemfile: gemfiles/rails_6_1.gemfile
-    - rvm: '2.3'
-      gemfile: gemfiles/rails_6_1.gemfile
-    - rvm: '2.4'
-      gemfile: gemfiles/rails_6_1.gemfile
-    - rvm: '2.2'
-      gemfile: gemfiles/rails_edge.gemfile
-    - rvm: '2.3'
-      gemfile: gemfiles/rails_edge.gemfile
-    - rvm: '2.4'
-      gemfile: gemfiles/rails_edge.gemfile
-    - rvm: '2.5'
-      gemfile: gemfiles/rails_edge.gemfile
-    - rvm: '2.6'
-      gemfile: gemfiles/rails_edge.gemfile
-  allow_failures:
-    - rvm: ruby-head
-    - gemfile: gemfiles/rails_edge.gemfile
-notifications:
-  email: false
diff --git a/activerecord-session_store.gemspec b/activerecord-session_store.gemspec
index 8ffceed..efe846d 100644
--- 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
deleted file mode 100644
index 86890f6..0000000
--- a/gemfiles/rails_5_2.gemfile
+++ /dev/null
@@ -1,7 +0,0 @@
-source "https://rubygems.org"
-
-gem "actionpack", github: "rails/rails", branch: "5-2-stable"
-gem "activerecord", github: "rails/rails", branch: "5-2-stable"
-gem "railties", github: "rails/rails", branch: "5-2-stable"
-
-gemspec :path => "../"
diff --git a/gemfiles/rails_6_1.gemfile b/gemfiles/rails_6.1.gemfile
similarity index 100%
rename from gemfiles/rails_6_1.gemfile
rename to gemfiles/rails_6.1.gemfile
diff --git a/gemfiles/rails_6_0.gemfile b/gemfiles/rails_6_0.gemfile
deleted file mode 100644
index 81b5e76..0000000
--- a/gemfiles/rails_6_0.gemfile
+++ /dev/null
@@ -1,7 +0,0 @@
-source "https://rubygems.org"
-
-gem "actionpack", github: "rails/rails", branch: "6-0-stable"
-gem "activerecord", github: "rails/rails", branch: "6-0-stable"
-gem "railties", github: "rails/rails", branch: "6-0-stable"
-
-gemspec :path => "../"
diff --git a/gemfiles/rails_7.0.gemfile b/gemfiles/rails_7.0.gemfile
new file mode 100644
index 0000000..542a6a8
--- /dev/null
+++ 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
index 824c295..b78671f 100644
--- 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 => "../"