8000 Add Active Support 7 support by tagliala · Pull Request #314 · activeadmin/arbre · GitHub
[go: up one dir, main page]
Skip to content

Add Active Support 7 support #314

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Dec 21, 2021
Merged

Add Active Support 7 support #314

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
aedb879
Allow Active Support 7.0
tagliala Dec 20, 2021
b2a867d
Use selector to detect authenticity token input
tagliala Dec 20, 2021
0979040
Update changelog
tagliala Dec 21, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 22 additions & 14 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,16 @@ jobs:
fail-fast: false

matrix:
ruby: [2.5.8, 2.6.6, 2.7.2, 3.0.0, jruby-9.2.16.0]
ruby: [2.5.9, 2.6.9, 2.7.5, 3.0.3, jruby-9.3.2.0]
deps: [rails_61, rails_70]

env:
BUNDLE_PATH: vendor/bundle
exclude:
- deps: rails_70
ruby: 2.5.9
- deps: rails_70
ruby: 2.6.9
- deps: rails_70
ruby: jruby-9.3.2.0

steps:
- uses: actions/checkout@v2
Expand All @@ -32,20 +38,22 @@ jobs:
ruby-version: ${{ matrix.ruby }}
bundler: none

- name: Install a specific rubygems version
run: gem update --system 3.2.0.rc.1
- name: Configure bundler (default)
run: |
echo "BUNDLE_GEMFILE=Gemfile" >> $GITHUB_ENV
echo "BUNDLE_PATH=$(pwd)/vendor/bundle" >> $GITHUB_ENV
if: matrix.deps == 'rails_70'

- name: Install a specific bundler version
run: gem install bundler -v 2.1.4
- 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_70'

- name: Restore cached dependencies
uses: actions/cache@v2
- uses: ruby/setup-ruby@v1
with:
path: ${{ env.BUNDLE_PATH }}
key: gems-${{ matrix.ruby }}-${{ hashFiles('current_gemfile.lock') }}

- name: Install dependencies
run: bundle install --jobs 3
ruby-version: ${{ matrix.ruby }}
bundler-cache: true

- name: Run tests
run: bundle exec rake
4 changes: 4 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@

## Master (unreleased)

* Allow activesupport 7.0. [#314][] by [@tagliala][]

## 1.4.0 [☰](https://github.com/activeadmin/arbre/compare/v1.3.0...v1.4.0)

* Allow activesupport 6.1 prereleases. [#242][] by [@deivid-rodriguez][]
Expand Down Expand Up @@ -98,6 +100,7 @@ Initial release and extraction from Active Admin
[#202]: https://github.com/activeadmin/arbre/pull/202
[#205]: https://github.com/activeadmin/arbre/pull/205
[#242]: https://github.com/activeadmin/arbre/pull/242
[#314]: https://github.com/activeadmin/arbre/pull/314

[@aramvisser]: https://github.com/aramvisser
[@LTe]: https://github.com/LTe
Expand All @@ -113,3 +116,4 @@ Initial release and extraction from Active Admin
[@seanlinsley]: https://github.com/seanlinsley
[@timoschilling]: https://github.com/timoschilling
[@varyonic]: https://github.com/varyonic
[@tagliala]: https://github.com/tagliala
2 changes: 1 addition & 1 deletion Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ group :release do
end

group :rails do
gem 'rails', '~> 6.1.a'
gem 'rails', '~> 7.0.0'
gem 'rspec-rails'
gem 'combustion'
gem 'capybara'
Expand Down
Loading
0