Skip to content

Commit

Permalink
Add rails 7.2 to matrix (#741)
Browse files Browse the repository at this point in the history
* 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]>
  • Loading branch information
lcreid and github-actions authored Oct 14, 2024
1 parent d177832 commit 8b44963
Show file tree
Hide file tree
Showing 79 changed files with 250 additions and 167 deletions.
7 changes: 6 additions & 1 deletion .github/workflows/ruby.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,10 +33,14 @@ jobs:
fail-fast: false
matrix:
ruby-version: [ '3.3', '3.2', '3.1', '3.0', 'ruby-head' ]
gemfile: [ '7.1', '7.0', '6.1', 'edge' ]
gemfile: [ '7.2', '7.1', '7.0', '6.1', 'edge' ]
exclude:
- ruby-version: '3.1'
gemfile: 'edge'
- ruby-version: '3.0'
gemfile: 'edge'
- ruby-version: '3.0'
gemfile: '7.2'
env:
BUNDLE_GEMFILE: gemfiles/${{ matrix.gemfile }}.gemfile
steps:
Expand All @@ -57,6 +61,7 @@ jobs:
with:
working-directory: demo
bundler-cache: true
ruby-version: 3.3.2
- name: Run tests
working-directory: demo
run: bundle exec rake test:all
Expand Down
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ demo/db/*.sqlite3
demo/db/*.sqlite3-shm
demo/db/*.sqlite3-wal
demo/doc/screenshots/**/*.diff.png
demo/doc/screenshots/**/*.base.png
demo/log/*.log
demo/storage
demo/tmp/
Expand Down Expand Up @@ -73,3 +74,4 @@ docker-compose.override.yml
.gnupg/
.ssh/
.gitconfig
.gk/
2 changes: 1 addition & 1 deletion .yarnrc
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@
# yarn lockfile v1


lastUpdateCheck 1718162593302
lastUpdateCheck 1728862732146
5 changes: 3 additions & 2 deletions demo/Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ source "https://rubygems.org"

gem "bootstrap_form", path: ".."

gem "rails", "~> 7.1.1"
gem "rails", "~> 7.2.1"

gem "bootsnap", require: false
gem "cssbundling-rails"
Expand All @@ -11,7 +11,7 @@ gem "jbuilder"
gem "jsbundling-rails"
gem "puma"
gem "sprockets-rails", require: "sprockets/railtie"
gem "sqlite3", "~> 1.4"
gem "sqlite3"
gem "tzinfo-data", platforms: %i[mingw mswin x64_mingw jruby]

group :development, :test do
Expand All @@ -24,5 +24,6 @@ end

group :test do
gem "capybara-screenshot-diff"
gem "chunky_png", "~> 1.4"
gem "selenium-webdriver"
end
Loading

0 comments on commit 8b44963

Please sign in to comment.