Skip to content

Commit

Permalink
Allow Rails 7.0
Browse files Browse the repository at this point in the history
  • Loading branch information
tagliala committed Dec 24, 2021
1 parent 67c9ba6 commit a4f7795
Show file tree
Hide file tree
Showing 16 changed files with 749 additions and 267 deletions.
6 changes: 6 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,12 @@ updates:
interval: daily
versioning-strategy: lockfile-only

- package-ecosystem: bundler
directory: /gemfiles/rails_61
schedule:
interval: daily
versioning-strategy: lockfile-only

- package-ecosystem: bundler
directory: /gemfiles/rails_61_turbolinks
schedule:
Expand Down
11 changes: 8 additions & 3 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,12 @@ jobs:

os: [ubuntu-20.04]

deps: [rails_52, rails_60, rails_61, rails_61_turbolinks, rails_61_webpacker]
deps: [rails_52, rails_60, rails_61, rails_61_turbolinks, rails_61_webpacker, rails_70]

exclude:
- ruby: { name: 2.6, value: 2.6.6 }
os: ubuntu-20.04
deps: rails_70

include:
- ruby: { name: 2.5, value: 2.5.8 }
Expand All @@ -106,13 +111,13 @@ jobs:
run: |
echo "BUNDLE_GEMFILE=Gemfile" >> $GITHUB_ENV
echo "BUNDLE_PATH=$(pwd)/vendor/bundle" >> $GITHUB_ENV
if: matrix.deps == 'rails_61'
if: matrix.deps == 'rails_70'

- name: Configure bundler (alternative)
run: |
echo "BUNDLE_GEMFILE=gemfiles/${{ matrix.deps }}/Gemfile" >> $GITHUB_ENV
echo "BUNDLE_PATH=$(pwd)/gemfiles/${{ matrix.deps }}/vendor/bundle" >> $GITHUB_ENV
if: matrix.deps != 'rails_61'
if: matrix.deps != 'rails_70'

- uses: ruby/setup-ruby@v1
with:
Expand Down
14 changes: 9 additions & 5 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
# frozen_string_literal: true
source "https://rubygems.org"

gem "inherited_resources", github: "activeadmin/inherited_resources" # FIXME: remove
gem "ransack", github: "activerecord-hackery/ransack" # FIXME: remove
gem "arbre", github: "activeadmin/arbre" # FIXME: remove

group :development, :test do
gem "rake"
gem "pry" # Easily debug from your console with `binding.pry`
Expand All @@ -13,7 +17,7 @@ group :development, :test do
gem "draper"
gem "devise"

gem "rails", "~> 6.1.0"
gem "rails", "~> 7.0.0"
gem "activerecord-jdbcsqlite3-adapter", platform: :jruby

gem "sprockets-rails"
Expand All @@ -24,14 +28,14 @@ group :test do
gem "cuprite"
gem "capybara"
gem "webrick"
gem "db-query-matchers"
gem "db-query-matchers", github: "tagliala/db-query-matchers", branch: "chore/allow-latest-gem-versions" # FIXME: revert to stable

gem "simplecov", require: false # Test coverage generator. Go to /coverage/ after running tests
gem "cucumber-rails", require: false
gem "cucumber-rails", github: "erikaxel/cucumber-rails", require: false # FIXME: revert to stable
gem "cucumber"
gem "database_cleaner"
gem "jasmine"
gem "jasmine-core"
gem "jasmine", "~> 2.99"
gem "jasmine-core", "~> 2.99"
gem "launchy"
gem "parallel_tests"
gem "rails-i18n" # Provides default i18n for many languages
Expand Down

0 comments on commit a4f7795

Please sign in to comment.