Skip to content

Commit 3f11052

Browse files
blocknotesblocknotes
authored
Merge pull request #29 from blocknotes/ci/update-gh-workflows
CI: update GH workflows
2 parents 71dfead + cc76e53 commit 3f11052

35 files changed

+1524
-653
lines changed

‎.github/workflows/linters.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414

1515
steps:
1616
- name: Checkout repository
17-
uses: actions/checkout@v2
17+
uses: actions/checkout@v4
1818

1919
- name: Set up Ruby
2020
uses: ruby/setup-ruby@v1

‎.github/workflows/specs3.yml ‎.github/workflows/specs_rails70.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,15 @@ jobs:
1313

1414
strategy:
1515
matrix:
16-
ruby: ['3.0', '3.1', '3.2']
16+
ruby: ['3.0', '3.2']
1717
gemfile: ['rails70_activeadmin']
1818

1919
env:
2020
BUNDLE_GEMFILE: ${{ github.workspace }}/gemfiles/${{ matrix.gemfile }}.gemfile
2121

2222
steps:
2323
- name: Checkout repository
24-
uses: actions/checkout@v2
24+
uses: actions/checkout@v4
2525

2626
- name: Set up Ruby
2727
uses: ruby/setup-ruby@v1
@@ -33,7 +33,7 @@ jobs:
3333
run: bundle exec rspec --profile
3434

3535
- name: On failure, archive screenshots as artifacts
36-
uses: actions/upload-artifact@v2
36+
uses: actions/upload-artifact@v4
3737
if: failure()
3838
with:
3939
name: test-failed-screenshots

‎.github/workflows/specs.yml ‎.github/workflows/specs_rails71.yml

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
name: Specs Rails 6.0
2+
name: Specs Rails 7.1
33

44
on:
55
pull_request:
@@ -13,15 +13,15 @@ jobs:
1313

1414
strategy:
1515
matrix:
16-
ruby: ['2.7']
17-
gemfile: ['rails60_activeadmin']
16+
ruby: ['3.2', '3.4']
17+
gemfile: ['rails71_activeadmin']
1818

1919
env:
2020
BUNDLE_GEMFILE: ${{ github.workspace }}/gemfiles/${{ matrix.gemfile }}.gemfile
2121

2222
steps:
2323
- name: Checkout repository
24-
uses: actions/checkout@v2
24+
uses: actions/checkout@v4
2525

2626
- name: Set up Ruby
2727
uses: ruby/setup-ruby@v1
@@ -33,7 +33,7 @@ jobs:
3333
run: bundle exec rspec --profile
3434

3535
- name: On failure, archive screenshots as artifacts
36-
uses: actions/upload-artifact@v2
36+
uses: actions/upload-artifact@v4
3737
if: failure()
3838
with:
3939
name: test-failed-screenshots

‎.github/workflows/specs2.yml ‎.github/workflows/specs_rails72.yml

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
name: Specs Rails 6.1
2+
name: Specs Rails 7.2
33

44
on:
55
pull_request:
@@ -13,15 +13,15 @@ jobs:
1313

1414
strategy:
1515
matrix:
16-
ruby: ['2.7', '3.0']
17-
gemfile: ['rails61_activeadmin29', 'rails61_activeadmin']
16+
ruby: ['3.2', '3.4']
17+
gemfile: ['rails72_activeadmin']
1818

1919
env:
2020
BUNDLE_GEMFILE: ${{ github.workspace }}/gemfiles/${{ matrix.gemfile }}.gemfile
2121

2222
steps:
2323
- name: Checkout repository
24-
uses: actions/checkout@v2
24+
uses: actions/checkout@v4
2525

2626
- name: Set up Ruby
2727
uses: ruby/setup-ruby@v1
@@ -33,7 +33,7 @@ jobs:
3333
run: bundle exec rspec --profile
3434

3535
- name: On failure, archive screenshots as artifacts
36-
uses: actions/upload-artifact@v2
36+
uses: actions/upload-artifact@v4
3737
if: failure()
3838
with:
3939
name: test-failed-screenshots

‎.github/workflows/specs_rails80.yml

+40
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
---
2+
name: Specs Rails 8.0
3+
4+
on:
5+
pull_request:
6+
branches: [master]
7+
push:
8+
branches: [master]
9+
10+
jobs:
11+
test:
12+
runs-on: ubuntu-latest
13+
14+
strategy:
15+
matrix:
16+
ruby: ['3.2', '3.4']
17+
gemfile: ['rails80_activeadmin']
18+
19+
env:
20+
BUNDLE_GEMFILE: ${{ github.workspace }}/gemfiles/${{ matrix.gemfile }}.gemfile
21+
22+
steps:
23+
- name: Checkout repository
24+
uses: actions/checkout@v4
25+
26+
- name: Set up Ruby
27+
uses: ruby/setup-ruby@v1
28+
with:
29+
ruby-version: ${{ matrix.ruby }}
30+
bundler-cache: true
31+
32+
- name: Run tests
33+
run: bundle exec rspec --profile
34+
35+
- name: On failure, archive screenshots as artifacts
36+
uses: actions/upload-artifact@v4
37+
if: failure()
38+
with:
39+
name: test-failed-screenshots
40+
path: spec/dummy/tmp/screenshots

‎.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
/.rspec_failures
55
/.rubocop-*
66
/Gemfile.lock
7+
/gemfiles/.bundle/config
78

89
/_misc/
910
/spec/dummy/db/*.sqlite3*

‎Appraisals

+29-8
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,46 @@
11
# frozen_string_literal: true
22

3-
appraise 'rails60-activeadmin' do
4-
gem 'activeadmin'
5-
gem 'rails', '~> 6.0.0'
6-
gem 'selenium-webdriver', require: false
7-
end
8-
93
appraise 'rails61-activeadmin29' do
104
gem 'activeadmin', '~> 2.9.0'
115
gem 'rails', '~> 6.1.0'
6+
7+
gem 'nokogiri', '~> 1.17.2'
8+
gem 'sqlite3', '~> 1.7.0'
129
end
1310

1411
appraise 'rails61-activeadmin' do
1512
gem 'activeadmin'
1613
gem 'rails', '~> 6.1.0'
14+
15+
gem 'nokogiri', '~> 1.17.2'
16+
gem 'sqlite3', '~> 1.7.0'
1717
end
1818

1919
appraise 'rails70-activeadmin' do
2020
gem 'activeadmin'
2121
gem 'rails', '~> 7.0.0'
2222

23-
# NOTE: workaround for "undefined method `assets' for #<Rails::Application::Configuration:...>"
24-
gem 'sprockets-rails', '~> 3.4.2'
23+
gem 'nokogiri', '~> 1.17.2'
24+
gem 'sqlite3', '~> 1.7.0'
25+
end
26+
27+
appraise 'rails71-activeadmin' do
28+
gem 'activeadmin'
29+
gem 'rails', '~> 7.1.0'
30+
31+
gem 'sqlite3'
32+
end
33+
34+
appraise 'rails72-activeadmin' do
35+
gem 'activeadmin'
36+
gem 'rails', '~> 7.2.0'
37+
38+
gem 'sqlite3'
39+
end
40+
41+
appraise 'rails80-activeadmin' do
42+
gem 'activeadmin'
43+
gem 'rails', '~> 8.0.0'
44+
45+
gem 'sqlite3'
2546
end

‎Gemfile

+20-20
Original file line numberDiff line numberDiff line change
@@ -4,26 +4,26 @@ source 'https://rubygems.org'
44

55
gemspec
66

7-
group :development, :test do
8-
gem 'puma'
9-
gem 'sassc'
10-
gem 'sqlite3'
7+
gem 'bigdecimal'
8+
gem 'mutex_m'
9+
gem 'puma'
10+
gem 'sassc'
11+
gem 'sprockets-rails'
1112

12-
# Testing
13-
gem 'capybara'
14-
gem 'cuprite'
15-
gem 'rspec_junit_formatter'
16-
gem 'rspec-rails'
17-
gem 'rspec-retry'
13+
# Testing
14+
gem 'capybara'
15+
gem 'cuprite'
16+
gem 'rspec_junit_formatter'
17+
gem 'rspec-rails'
18+
gem 'rspec-retry'
1819

19-
# Linters
20-
gem 'fasterer'
21-
gem 'rubocop'
22-
gem 'rubocop-packaging'
23-
gem 'rubocop-performance'
24-
gem 'rubocop-rails'
25-
gem 'rubocop-rspec'
20+
# Linters
21+
gem 'fasterer'
22+
gem 'rubocop'
23+
gem 'rubocop-packaging'
24+
gem 'rubocop-performance'
25+
gem 'rubocop-rails'
26+
gem 'rubocop-rspec'
2627

27-
# Tools
28-
gem 'pry-rails'
29-
end
28+
# Tools
29+
gem 'pry-rails'

‎README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# ActiveAdmin Dynamic Fields
2-
[![gem version](https://badge.fury.io/rb/activeadmin_dynamic_fields.svg)](https://badge.fury.io/rb/activeadmin_dynamic_fields) [![gem downloads](https://badgen.net/rubygems/dt/activeadmin_dynamic_fields)](https://rubygems.org/gems/activeadmin_dynamic_fields) [![linters](https://github.com/blocknotes/activeadmin_dynamic_fields/actions/workflows/linters.yml/badge.svg)](https://github.com/blocknotes/activeadmin_dynamic_fields/actions/workflows/linters.yml) [![specs](https://github.com/blocknotes/activeadmin_dynamic_fields/actions/workflows/specs.yml/badge.svg)](https://github.com/blocknotes/activeadmin_dynamic_fields/actions/workflows/specs.yml)
2+
[![gem version](https://badge.fury.io/rb/activeadmin_dynamic_fields.svg)](https://badge.fury.io/rb/activeadmin_dynamic_fields) [![gem downloads](https://badgen.net/rubygems/dt/activeadmin_dynamic_fields)](https://rubygems.org/gems/activeadmin_dynamic_fields) [![linters](https://github.com/blocknotes/activeadmin_dynamic_fields/actions/workflows/linters.yml/badge.svg)](https://github.com/blocknotes/activeadmin_dynamic_fields/actions/workflows/linters.yml) [![specs](https://github.com/blocknotes/activeadmin_dynamic_fields/actions/workflows/specs_rails70.yml/badge.svg)](https://github.com/blocknotes/activeadmin_dynamic_fields/actions/workflows/specs_rails70.yml)
33

44
An Active Admin plugin to add dynamic behaviors to some fields.
55

‎activeadmin_dynamic_fields.gemspec

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,5 +23,5 @@ Gem::Specification.new do |spec|
2323

2424
spec.add_runtime_dependency 'activeadmin', '>= 2.0', '< 4'
2525

26-
spec.add_development_dependency 'appraisal', '~> 2.4'
26+
spec.add_development_dependency 'appraisal', '~> 2.4' # rubocop:disable Gemspec/DevelopmentDependencies
2727
end

‎gemfiles/rails60_activeadmin.gemfile

-27
This file was deleted.

0 commit comments

Comments
 (0)