Skip to content

Commit 8b44963

Browse files
lcreidgithub-actions
and
github-actions
authored
Add rails 7.2 to matrix (bootstrap-ruby#741)
* Rails 8 only Ruby 3.2+ * Yarn check * Ignore git kraken directory * Small image changes -- Trix? * Updates for version upgrade The capybara diff stuff changed a lot with the version upgrade. * After rails app:upgrade and resolving diffs * Prevent warning about assertion-less test * Update screenshots I assume this is because I upgraded gems and packages, and something is capturing screenshots slightly differently. * Fixes from rebase * Rubocop fixes I can't wait until Rails ships with Rubocop. * Don't use config open that doesn't exist in some versions * Exclude 3.0 from 7.2 * Use lowest schema version * Do excludes correctly for GitHub actions * I'm getting pretty much to the end of my rope * Force a newer Ruby version for demo test * Changed in CI Please review the changes in the files in this commit carefully, as they were automatically generated during CI. Run `git pull` to bring the changes into your local branch. Then, if you do not want the changes, run `git revert HEAD`. --------- Co-authored-by: github-actions <[email protected]>
1 parent d177832 commit 8b44963

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

79 files changed

+250
-167
lines changed

.github/workflows/ruby.yml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,14 @@ jobs:
3333
fail-fast: false
3434
matrix:
3535
ruby-version: [ '3.3', '3.2', '3.1', '3.0', 'ruby-head' ]
36-
gemfile: [ '7.1', '7.0', '6.1', 'edge' ]
36+
gemfile: [ '7.2', '7.1', '7.0', '6.1', 'edge' ]
3737
exclude:
38+
- ruby-version: '3.1'
39+
gemfile: 'edge'
3840
- ruby-version: '3.0'
3941
gemfile: 'edge'
42+
- ruby-version: '3.0'
43+
gemfile: '7.2'
4044
env:
4145
BUNDLE_GEMFILE: gemfiles/${{ matrix.gemfile }}.gemfile
4246
steps:
@@ -57,6 +61,7 @@ jobs:
5761
with:
5862
working-directory: demo
5963
bundler-cache: true
64+
ruby-version: 3.3.2
6065
- name: Run tests
6166
working-directory: demo
6267
run: bundle exec rake test:all

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ demo/db/*.sqlite3
1313
demo/db/*.sqlite3-shm
1414
demo/db/*.sqlite3-wal
1515
demo/doc/screenshots/**/*.diff.png
16+
demo/doc/screenshots/**/*.base.png
1617
demo/log/*.log
1718
demo/storage
1819
demo/tmp/
@@ -73,3 +74,4 @@ docker-compose.override.yml
7374
.gnupg/
7475
.ssh/
7576
.gitconfig
77+
.gk/

.yarnrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@
22
# yarn lockfile v1
33

44

5-
lastUpdateCheck 1718162593302
5+
lastUpdateCheck 1728862732146

demo/Gemfile

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ source "https://rubygems.org"
22

33
gem "bootstrap_form", path: ".."
44

5-
gem "rails", "~> 7.1.1"
5+
gem "rails", "~> 7.2.1"
66

77
gem "bootsnap", require: false
88
gem "cssbundling-rails"
@@ -11,7 +11,7 @@ gem "jbuilder"
1111
gem "jsbundling-rails"
1212
gem "puma"
1313
gem "sprockets-rails", require: "sprockets/railtie"
14-
gem "sqlite3", "~> 1.4"
14+
gem "sqlite3"
1515
gem "tzinfo-data", platforms: %i[mingw mswin x64_mingw jruby]
1616

1717
group :development, :test do
@@ -24,5 +24,6 @@ end
2424

2525
group :test do
2626
gem "capybara-screenshot-diff"
27+
gem "chunky_png", "~> 1.4"
2728
gem "selenium-webdriver"
2829
end

0 commit comments

Comments
 (0)