8000 Allow Rails 7.0 · tagliala/activeadmin@ed1de07 · GitHub
[go: up one dir, main page]
Skip to content

Commit ed1de07

Browse files
taglialatagliala
committed
Allow Rails 7.0
Also: - Update bundles - Strengthen jasmine dependency to prevent deprecation errors - Strengthen pry dependency to prevent deprecation errors Close activeadmin#7196
1 parent b611d6e commit ed1de07

File tree

16 files changed

+733
-251
lines changed

16 files changed

+733
-251
lines changed

‎.github/dependabot.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,12 @@ updates:
3333
interval: daily
3434
versioning-strategy: lockfile-only
3535

36+
- package-ecosystem: bundler
37+
directory: /gemfiles/rails_61
38+
schedule:
39+
interval: daily
40+
versioning-strategy: lockfile-only
41+
3642
- package-ecosystem: bundler
3743
directory: /gemfiles/rails_61_turbolinks
3844
schedule:

‎.github/workflows/ci.yaml

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,12 @@ jobs:
8181

8282
os: [ubuntu-20.04]
8383

84-
deps: [rails_52, rails_60, rails_61, rails_61_turbolinks, rails_61_webpacker]
84+
deps: [rails_52, rails_60, rails_61, rails_61_turbolinks, rails_61_webpacker, rails_70]
85+
86+
exclude:
87+
- ruby: { name: 2.6, value: 2.6.6 }
88+
os: ubuntu-20.04
89+
deps: rails_70
8590

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

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

117122
- uses: ruby/setup-ruby@v1
118123
with:

‎Gemfile

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,13 @@
11
# frozen_string_literal: true
22
source "https://rubygems.org"
33

4+
gem "inherited_resources", github: "activeadmin/inherited_resources" # FIXME: remove
5+
gem "ransack", github: "activerecord-hackery/ransack" # FIXME: remove
6+
gem "arbre", github: "activeadmin/arbre" # FIXME: remove
7+
48
group :development, :test do
59
gem "rake"
6-
gem "pry" # Easily debug from your console with `binding.pry`
10+
gem "pry", "~> 0.13.1" # Easily debug from your console with `binding.pry`
711
gem "pry-byebug", platform: :mri # Step-by-step debugging
812

913
gem "cancancan"
@@ -13,7 +17,7 @@ group :development, :test do
1317
gem "draper"
1418
gem "devise"
1519

16-
gem "rails", "~> 6.1.0"
20+
gem "rails", "~> 7.0.0"
1721
gem "activerecord-jdbcsqlite3-adapter", platform: :jruby
1822

1923
gem "sprockets-rails"
@@ -24,14 +28,14 @@ group :test do
2428
gem "cuprite"
2529
gem "capybara"
2630
gem "webrick"
27-
gem "db-query-matchers"
31+
gem "db-query-matchers", github: "tagliala/db-query-matchers", branch: "chore/allow-latest-gem-versions" # FIXME: revert to stable
2832

2933
gem "simplecov", require: false # Test coverage generator. Go to /coverage/ after running tests
30-
gem "cucumber-rails", require: false
34+
gem "cucumber-rails", github: "erikaxel/cucumber-rails", require: false # FIXME: revert to stable
3135
gem "cucumber"
3236
gem "database_cleaner"
33-
gem "jasmine"
34-
gem "jasmine-core"
37+
gem "jasmine", "~> 2.99"
38+
gem "jasmine-core", "~> 2.99"
3539
gem "launchy"
3640
gem "parallel_tests"
3741
gem "rails-i18n" # Provides default i18n for many languages

0 commit comments

Comments
 (0)
0