Skip to content

Commit 2075a4d

Browse files
committed
preparation for Rails 8.0
- add dedicated rails-8.0 target - relax version constraint on rails
1 parent d7756a9 commit 2075a4d

File tree

14 files changed

+364
-78
lines changed

14 files changed

+364
-78
lines changed

.github/dependabot.yml

+12
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,18 @@ updates:
6969
- version-update:semver-major
7070
- version-update:semver-minor
7171

72+
- package-ecosystem: "bundler"
73+
directory: "/gemfiles/rails-8.0"
74+
schedule:
75+
interval: "daily"
76+
time: "08:30"
77+
timezone: "Europe/Berlin"
78+
ignore:
79+
- dependency-name: "rails"
80+
update-types: # keep only patch level
81+
- version-update:semver-major
82+
- version-update:semver-minor
83+
7284
- package-ecosystem: "bundler"
7385
directory: "/gemfiles/rails-main" # 8.0 dev
7486
schedule:

.github/workflows/rails-main.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
strategy:
1212
matrix:
1313
ruby: ['3.2', '3.3']
14-
rails: ['main']
14+
rails: ['8.0', 'main']
1515

1616
env:
1717
BUNDLE_GEMFILE: ${{ github.workspace }}/gemfiles/rails-${{ matrix.rails }}/Gemfile

Gemfile.lock

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ PATH
33
specs:
44
texd (0.6.0)
55
multipart-post (~> 2.0)
6-
rails (>= 6.0, < 8)
6+
rails (>= 6.0, < 9)
77

88
GEM
99
remote: https://rubygems.org/
@@ -200,7 +200,7 @@ GEM
200200
rspec-core (~> 3.13.0)
201201
rspec-expectations (~> 3.13.0)
202202
rspec-mocks (~> 3.13.0)
203-
rspec-core (3.13.1)
203+
rspec-core (3.13.2)
204204
rspec-support (~> 3.13.0)
205205
rspec-expectations (3.13.3)
206206
diff-lcs (>= 1.2.0, < 2.0)

Makefile

+12-5
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,15 @@ SPEC =
44
test: test-stable rubocop
55

66
.PHONY: test-stable
7-
test-stable: rails-6.0 rails-6.1 rails-7.0 rails-7.1
7+
test-stable: rails-6.0 rails-6.1 rails-7.0 rails-7.1 rails-7.2
88

99
.PHONY: test-all
10-
test-all: test rails-main rails-7.2
10+
test-all: test rails-main rails-8.0
1111

1212
.PHONY: update-test
1313
update-test: update test-all
14-
git add Gemfile.lock gemfiles/*/Gemfile.lock
15-
git commit -m "update dependencies"
14+
# git add Gemfile.lock gemfiles/*/Gemfile.lock
15+
# git commit -m "update dependencies"
1616

1717
.PHONY: rails-6.0
1818
rails-6.0:
@@ -39,6 +39,11 @@ rails-7.2:
3939
bin/make-helper.sh 7.2 bundle --quiet
4040
bin/make-helper.sh 7.2 rspec $(SPEC)
4141

42+
.PHONY: rails-8.0
43+
rails-8.0:
44+
bin/make-helper.sh 8.0 bundle --quiet
45+
bin/make-helper.sh 8.0 rspec $(SPEC)
46+
4247
.PHONY: rails-main
4348
rails-main:
4449
bin/make-helper.sh main bundle --quiet
@@ -51,7 +56,8 @@ setup:
5156
bin/make-helper.sh 7.0 gem install bundler:2.4.22
5257
bin/make-helper.sh 7.1 gem install bundler:2.4.22
5358
bin/make-helper.sh 7.2 gem install bundler:2.5.6
54-
bin/make-helper.sh main gem install bundler:2.5.6
59+
bin/make-helper.sh 7.2 gem install bundler:2.5.22
60+
bin/make-helper.sh main gem install bundler:2.5.22
5561
bin/make-helper.sh . gem install bundler:2.4.22
5662

5763
.PHONY: update
@@ -61,6 +67,7 @@ update:
6167
bin/make-helper.sh 7.0 bundle update && bin/make-helper.sh 7.0 bundle clean --force
6268
bin/make-helper.sh 7.1 bundle update && bin/make-helper.sh 7.1 bundle clean --force
6369
bin/make-helper.sh 7.2 bundle update && bin/make-helper.sh 7.2 bundle clean --force
70+
bin/make-helper.sh 8.0 bundle update && bin/make-helper.sh 8.0 bundle clean --force
6471
bin/make-helper.sh main bundle update && bin/make-helper.sh main bundle clean --force
6572
bin/make-helper.sh . bundle update && bin/make-helper.sh . bundle clean --force
6673

bin/make-helper.sh

+5
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,11 @@ case "$rails_ver" in
5757
ruby_ver="3.2"
5858
gemset_dir="./gems/rails-main"
5959
;;
60+
"8.0")
61+
gemdir="gemfiles/rails-8.0"
62+
ruby_ver="3.2"
63+
gemset_dir="./gems/rails-8.0"
64+
;;
6065
"7.2")
6166
gemdir="gemfiles/rails-7.2"
6267
ruby_ver="3.1"

gemfiles/rails-6.0/Gemfile.lock

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ PATH
33
specs:
44
texd (0.6.0)
55
multipart-post (~> 2.0)
6-
rails (>= 6.0, < 8)
6+
rails (>= 6.0, < 9)
77

88
GEM
99
remote: https://rubygems.org/
@@ -151,7 +151,7 @@ GEM
151151
rspec-core (~> 3.13.0)
152152
rspec-expectations (~> 3.13.0)
153153
rspec-mocks (~> 3.13.0)
154-
rspec-core (3.13.1)
154+
rspec-core (3.13.2)
155155
rspec-support (~> 3.13.0)
156156
rspec-expectations (3.13.3)
157157
diff-lcs (>= 1.2.0, < 2.0)

gemfiles/rails-6.1/Gemfile.lock

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ PATH
33
specs:
44
texd (0.6.0)
55
multipart-post (~> 2.0)
6-
rails (>= 6.0, < 8)
6+
rails (>= 6.0, < 9)
77

88
GEM
99
remote: https://rubygems.org/
@@ -155,7 +155,7 @@ GEM
155155
rspec-core (~> 3.13.0)
156156
rspec-expectations (~> 3.13.0)
157157
rspec-mocks (~> 3.13.0)
158-
rspec-core (3.13.1)
158+
rspec-core (3.13.2)
159159
rspec-support (~> 3.13.0)
160160
rspec-expectations (3.13.3)
161161
diff-lcs (>= 1.2.0, < 2.0)

gemfiles/rails-7.0/Gemfile.lock

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ PATH
33
specs:
44
texd (0.6.0)
55
multipart-post (~> 2.0)
6-
rails (>= 6.0, < 8)
6+
rails (>= 6.0, < 9)
77

88
GEM
99
remote: https://rubygems.org/
@@ -161,7 +161,7 @@ GEM
161161
rspec-core (~> 3.13.0)
162162
rspec-expectations (~> 3.13.0)
163163
rspec-mocks (~> 3.13.0)
164-
rspec-core (3.13.1)
164+
rspec-core (3.13.2)
165165
rspec-support (~> 3.13.0)
166166
rspec-expectations (3.13.3)
167167
diff-lcs (>= 1.2.0, < 2.0)

gemfiles/rails-7.1/Gemfile.lock

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ PATH
33
specs:
44
texd (0.6.0)
55
multipart-post (~> 2.0)
6-
rails (>= 6.0, < 8)
6+
rails (>= 6.0, < 9)
77

88
GEM
99
remote: https://rubygems.org/
@@ -191,7 +191,7 @@ GEM
191191
rspec-core (~> 3.13.0)
192192
rspec-expectations (~> 3.13.0)
193193
rspec-mocks (~> 3.13.0)
194-
rspec-core (3.13.1)
194+
rspec-core (3.13.2)
195195
rspec-support (~> 3.13.0)
196196
rspec-expectations (3.13.3)
197197
diff-lcs (>= 1.2.0, < 2.0)

gemfiles/rails-7.2/Gemfile.lock

+3-3
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ PATH
33
specs:
44
texd (0.6.0)
55
multipart-post (~> 2.0)
6-
rails (>= 6.0, < 8)
6+
rails (>= 6.0, < 9)
77

88
GEM
99
remote: https://rubygems.org/
@@ -116,7 +116,7 @@ GEM
116116
mini_mime (1.1.5)
117117
minitest (5.25.1)
118118
multipart-post (2.4.1)
119-
net-imap (0.4.17)
119+
net-imap (0.5.0)
120120
date
121121
net-protocol
122122
net-pop (0.1.2)
@@ -193,7 +193,7 @@ GEM
193193
rspec-core (~> 3.13.0)
194194
rspec-expectations (~> 3.13.0)
195195
rspec-mocks (~> 3.13.0)
196-
rspec-core (3.13.1)
196+
rspec-core (3.13.2)
197197
rspec-support (~> 3.13.0)
198198
rspec-expectations (3.13.3)
199199
diff-lcs (>= 1.2.0, < 2.0)

gemfiles/rails-8.0/Gemfile

+15
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
# frozen_string_literal: true
2+
3+
source "https://rubygems.org"
4+
gemspec path: "../.."
5+
6+
gem "pry-byebug"
7+
gem "rails", "~> 8.0.0.rc1"
8+
9+
# keep in sync with ../../Gemfile
10+
group :development, :test do
11+
gem "combustion"
12+
gem "rake", "~> 13.0"
13+
gem "rspec", "~> 3.0"
14+
gem "rspec-rails"
15+
end

0 commit comments

Comments
 (0)