From 7262a450849a7eb08fe6ef29a6b5cc62fa00583e Mon Sep 17 00:00:00 2001
From: Andrew Kane <andrew@ankane.org>
Date: Wed, 15 Dec 2021 19:01:40 -0800
Subject: [PATCH] Test with Rails 7 by default

---
 .github/workflows/build.yml                   | 3 +--
 Gemfile                                       | 4 ++--
 gemfiles/{rails70.gemfile => rails61.gemfile} | 4 ++--
 3 files changed, 5 insertions(+), 6 deletions(-)
 rename gemfiles/{rails70.gemfile => rails61.gemfile} (62%)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 806f969..e0c102c 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -2,7 +2,6 @@ name: build
 on: [push, pull_request]
 jobs:
   build:
-    if: "!contains(github.event.head_commit.message, '[skip ci]')"
     runs-on: ubuntu-latest
     strategy:
       fail-fast: false
@@ -11,7 +10,7 @@ jobs:
         - ruby: 3.0
           gemfile: Gemfile
         - ruby: 3.0
-          gemfile: gemfiles/rails70.gemfile
+          gemfile: gemfiles/rails61.gemfile
         - ruby: 2.7
           gemfile: gemfiles/rails60.gemfile
         - ruby: 2.6
diff --git a/Gemfile b/Gemfile
index 647d353..67f0f6b 100644
--- a/Gemfile
+++ b/Gemfile
@@ -5,6 +5,6 @@ gemspec
 gem "rake"
 gem "minitest", ">= 5"
 gem "combustion"
-gem "rails", "~> 6.1.0"
+gem "rails", "~> 7.0.0"
 gem "sqlite3"
-gem "devise"
+gem "devise", github: "heartcombo/devise"
diff --git a/gemfiles/rails70.gemfile b/gemfiles/rails61.gemfile
similarity index 62%
rename from gemfiles/rails70.gemfile
rename to gemfiles/rails61.gemfile
index e1abf9f..c27097b 100644
--- a/gemfiles/rails70.gemfile
+++ b/gemfiles/rails61.gemfile
@@ -5,6 +5,6 @@ gemspec path: ".."
 gem "rake"
 gem "minitest", ">= 5"
 gem "combustion"
-gem "rails", "~> 7.0.0.rc1"
+gem "rails", "~> 6.1.0"
 gem "sqlite3"
-gem "devise", github: "heartcombo/devise"
+gem "devise"