Test with Rails 7 by default

cacheventures · Dec 16, 2021 · 7262a45 · 7262a45
1 parent fa378c6
commit 7262a45
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 6 deletions.
diff --git 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
@@ -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 → gemfiles/rails61.gemfile b/gemfiles/rails70.gemfile → 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"