preparation for Rails 8.0

- add dedicated rails-8.0 target - relax version constraint on rails
digineo · Oct 21, 2024 · 2075a4d · 2075a4d
1 parent d7756a9
commit 2075a4d
Show file tree

Hide file tree

Showing 14 changed files with 364 additions and 78 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -69,6 +69,18 @@ updates:
           - version-update:semver-major
           - version-update:semver-minor
 
+  - package-ecosystem: "bundler"
+    directory: "/gemfiles/rails-8.0"
+    schedule:
+      interval: "daily"
+      time:     "08:30"
+      timezone: "Europe/Berlin"
+    ignore:
+      - dependency-name: "rails"
+        update-types: # keep only patch level
+          - version-update:semver-major
+          - version-update:semver-minor
+
   - package-ecosystem: "bundler"
     directory: "/gemfiles/rails-main" # 8.0 dev
     schedule:

diff --git a/.github/workflows/rails-main.yml b/.github/workflows/rails-main.yml
@@ -11,7 +11,7 @@ jobs:
     strategy:
       matrix:
         ruby:  ['3.2', '3.3']
-        rails: ['main']
+        rails: ['8.0', 'main']
 
     env:
       BUNDLE_GEMFILE: ${{ github.workspace }}/gemfiles/rails-${{ matrix.rails }}/Gemfile

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -3,7 +3,7 @@ PATH
   specs:
     texd (0.6.0)
       multipart-post (~> 2.0)
-      rails (>= 6.0, < 8)
+      rails (>= 6.0, < 9)
 
 GEM
   remote: https://rubygems.org/
@@ -200,7 +200,7 @@ GEM
       rspec-core (~> 3.13.0)
       rspec-expectations (~> 3.13.0)
       rspec-mocks (~> 3.13.0)
-    rspec-core (3.13.1)
+    rspec-core (3.13.2)
       rspec-support (~> 3.13.0)
     rspec-expectations (3.13.3)
       diff-lcs (>= 1.2.0, < 2.0)

diff --git a/Makefile b/Makefile
@@ -4,15 +4,15 @@ SPEC =
 test: test-stable rubocop
 
 .PHONY: test-stable
-test-stable: rails-6.0 rails-6.1 rails-7.0 rails-7.1
+test-stable: rails-6.0 rails-6.1 rails-7.0 rails-7.1 rails-7.2
 
 .PHONY: test-all
-test-all: test rails-main rails-7.2
+test-all: test rails-main rails-8.0
 
 .PHONY: update-test
 update-test: update test-all
-	git add Gemfile.lock gemfiles/*/Gemfile.lock
-	git commit -m "update dependencies"
+	# git add Gemfile.lock gemfiles/*/Gemfile.lock
+	# git commit -m "update dependencies"
 
 .PHONY: rails-6.0
 rails-6.0:
@@ -39,6 +39,11 @@ rails-7.2:
 	bin/make-helper.sh 7.2 bundle --quiet
 	bin/make-helper.sh 7.2 rspec $(SPEC)
 
+.PHONY: rails-8.0
+rails-8.0:
+	bin/make-helper.sh 8.0 bundle --quiet
+	bin/make-helper.sh 8.0 rspec $(SPEC)
+
 .PHONY: rails-main
 rails-main:
 	bin/make-helper.sh main bundle --quiet
@@ -51,7 +56,8 @@ setup:
 	bin/make-helper.sh 7.0  gem install bundler:2.4.22
 	bin/make-helper.sh 7.1  gem install bundler:2.4.22
 	bin/make-helper.sh 7.2  gem install bundler:2.5.6
-	bin/make-helper.sh main gem install bundler:2.5.6
+	bin/make-helper.sh 7.2  gem install bundler:2.5.22
+	bin/make-helper.sh main gem install bundler:2.5.22
 	bin/make-helper.sh .    gem install bundler:2.4.22
 
 .PHONY: update
@@ -61,6 +67,7 @@ update:
 	bin/make-helper.sh 7.0  bundle update && bin/make-helper.sh 7.0  bundle clean --force
 	bin/make-helper.sh 7.1  bundle update && bin/make-helper.sh 7.1  bundle clean --force
 	bin/make-helper.sh 7.2  bundle update && bin/make-helper.sh 7.2  bundle clean --force
+	bin/make-helper.sh 8.0  bundle update && bin/make-helper.sh 8.0  bundle clean --force
 	bin/make-helper.sh main bundle update && bin/make-helper.sh main bundle clean --force
 	bin/make-helper.sh .    bundle update && bin/make-helper.sh .    bundle clean --force
 

diff --git a/bin/make-helper.sh b/bin/make-helper.sh
@@ -57,6 +57,11 @@ case "$rails_ver" in
 	ruby_ver="3.2"
 	gemset_dir="./gems/rails-main"
 	;;
+"8.0")
+	gemdir="gemfiles/rails-8.0"
+	ruby_ver="3.2"
+	gemset_dir="./gems/rails-8.0"
+	;;
 "7.2")
 	gemdir="gemfiles/rails-7.2"
 	ruby_ver="3.1"

diff --git a/gemfiles/rails-6.0/Gemfile.lock b/gemfiles/rails-6.0/Gemfile.lock
@@ -3,7 +3,7 @@ PATH
   specs:
     texd (0.6.0)
       multipart-post (~> 2.0)
-      rails (>= 6.0, < 8)
+      rails (>= 6.0, < 9)
 
 GEM
   remote: https://rubygems.org/
@@ -151,7 +151,7 @@ GEM
       rspec-core (~> 3.13.0)
       rspec-expectations (~> 3.13.0)
       rspec-mocks (~> 3.13.0)
-    rspec-core (3.13.1)
+    rspec-core (3.13.2)
       rspec-support (~> 3.13.0)
     rspec-expectations (3.13.3)
       diff-lcs (>= 1.2.0, < 2.0)

diff --git a/gemfiles/rails-6.1/Gemfile.lock b/gemfiles/rails-6.1/Gemfile.lock
@@ -3,7 +3,7 @@ PATH
   specs:
     texd (0.6.0)
       multipart-post (~> 2.0)
-      rails (>= 6.0, < 8)
+      rails (>= 6.0, < 9)
 
 GEM
   remote: https://rubygems.org/
@@ -155,7 +155,7 @@ GEM
       rspec-core (~> 3.13.0)
       rspec-expectations (~> 3.13.0)
       rspec-mocks (~> 3.13.0)
-    rspec-core (3.13.1)
+    rspec-core (3.13.2)
       rspec-support (~> 3.13.0)
     rspec-expectations (3.13.3)
       diff-lcs (>= 1.2.0, < 2.0)

diff --git a/gemfiles/rails-7.0/Gemfile.lock b/gemfiles/rails-7.0/Gemfile.lock
@@ -3,7 +3,7 @@ PATH
   specs:
     texd (0.6.0)
       multipart-post (~> 2.0)
-      rails (>= 6.0, < 8)
+      rails (>= 6.0, < 9)
 
 GEM
   remote: https://rubygems.org/
@@ -161,7 +161,7 @@ GEM
       rspec-core (~> 3.13.0)
       rspec-expectations (~> 3.13.0)
       rspec-mocks (~> 3.13.0)
-    rspec-core (3.13.1)
+    rspec-core (3.13.2)
       rspec-support (~> 3.13.0)
     rspec-expectations (3.13.3)
       diff-lcs (>= 1.2.0, < 2.0)

diff --git a/gemfiles/rails-7.1/Gemfile.lock b/gemfiles/rails-7.1/Gemfile.lock
@@ -3,7 +3,7 @@ PATH
   specs:
     texd (0.6.0)
       multipart-post (~> 2.0)
-      rails (>= 6.0, < 8)
+      rails (>= 6.0, < 9)
 
 GEM
   remote: https://rubygems.org/
@@ -191,7 +191,7 @@ GEM
       rspec-core (~> 3.13.0)
       rspec-expectations (~> 3.13.0)
       rspec-mocks (~> 3.13.0)
-    rspec-core (3.13.1)
+    rspec-core (3.13.2)
       rspec-support (~> 3.13.0)
     rspec-expectations (3.13.3)
       diff-lcs (>= 1.2.0, < 2.0)

diff --git a/gemfiles/rails-7.2/Gemfile.lock b/gemfiles/rails-7.2/Gemfile.lock
@@ -3,7 +3,7 @@ PATH
   specs:
     texd (0.6.0)
       multipart-post (~> 2.0)
-      rails (>= 6.0, < 8)
+      rails (>= 6.0, < 9)
 
 GEM
   remote: https://rubygems.org/
@@ -116,7 +116,7 @@ GEM
     mini_mime (1.1.5)
     minitest (5.25.1)
     multipart-post (2.4.1)
-    net-imap (0.4.17)
+    net-imap (0.5.0)
       date
       net-protocol
     net-pop (0.1.2)
@@ -193,7 +193,7 @@ GEM
       rspec-core (~> 3.13.0)
       rspec-expectations (~> 3.13.0)
       rspec-mocks (~> 3.13.0)
-    rspec-core (3.13.1)
+    rspec-core (3.13.2)
       rspec-support (~> 3.13.0)
     rspec-expectations (3.13.3)
       diff-lcs (>= 1.2.0, < 2.0)

diff --git a/gemfiles/rails-8.0/Gemfile b/gemfiles/rails-8.0/Gemfile
@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+source "https://rubygems.org"
+gemspec path: "../.."
+
+gem "pry-byebug"
+gem "rails", "~> 8.0.0.rc1"
+
+# keep in sync with ../../Gemfile
+group :development, :test do
+  gem "combustion"
+  gem "rake", "~> 13.0"
+  gem "rspec", "~> 3.0"
+  gem "rspec-rails"
+end