Skip to content

Commit 03e64f0

Browse files
committed
run tests against active_support 7.0 and 7.1
Pins maxitest to a version with ruby 2.7 support.
1 parent 30f6483 commit 03e64f0

File tree

11 files changed

+160
-19
lines changed

11 files changed

+160
-19
lines changed

.github/workflows/ci.yml

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,9 @@
11
---
22
name: CI
3-
on:
4-
push:
5-
branches:
6-
- '**'
3+
on: [push]
74
jobs:
85
main:
9-
name: Ruby ${{ matrix.ruby }}
6+
name: Tests
107
runs-on: ubuntu-latest
118
strategy:
129
fail-fast: false
@@ -20,9 +17,14 @@ jobs:
2017
- '3.2'
2118
- '3.3'
2219
- jruby
20+
gemfile:
21+
- rails7.0
22+
- rails7.1
23+
env:
24+
BUNDLE_GEMFILE: gemfiles/${{ matrix.gemfile }}.gemfile
2325
steps:
24-
- uses: zendesk/checkout@v2
25-
- uses: zendesk/setup-ruby@v1
26+
- uses: actions/checkout@v4
27+
- uses: ruby/setup-ruby@v1
2628
with:
2729
ruby-version: ${{ matrix.ruby }}
2830
bundler-cache: true

.gitignore

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,5 +19,3 @@ rdoc
1919
pkg
2020
vendor
2121

22-
## PROJECT::SPECIFIC
23-
Gemfile.lock

Gemfile

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1 @@
1-
source 'https://rubygems.org'
2-
3-
gemspec
4-
5-
gem 'activesupport'
6-
gem 'bump'
7-
gem 'maxitest'
8-
gem 'mocha'
9-
gem 'rake'
1+
eval_gemfile "gemfiles/rails7.0.gemfile"

Gemfile.lock

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
PATH
2+
remote: .
3+
specs:
4+
prop (2.8.0)
5+
6+
GEM
7+
remote: https://rubygems.org/
8+
specs:
9+
activesupport (7.0.8)
10+
concurrent-ruby (~> 1.0, >= 1.0.2)
11+
i18n (>= 1.6, < 2)
12+
minitest (>= 5.1)
13+
tzinfo (~> 2.0)
14+
concurrent-ruby (1.2.2)
15+
i18n (1.14.1)
16+
concurrent-ruby (~> 1.0)
17+
maxitest (4.5.0)
18+
minitest (>= 5.0.0, < 5.19.0)
19+
minitest (5.18.1)
20+
mocha (2.1.0)
21+
ruby2_keywords (>= 0.0.5)
22+
rake (13.1.0)
23+
ruby2_keywords (0.0.5)
24+
tzinfo (2.0.6)
25+
concurrent-ruby (~> 1.0)
26+
27+
PLATFORMS
28+
ruby
29+
30+
DEPENDENCIES
31+
activesupport (~> 7.0.0)
32+
maxitest (< 5)
33+
mocha
34+
prop!
35+
rake
36+
37+
BUNDLED WITH
38+
2.4.22

Rakefile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
require 'bundler/setup'
22
require 'bundler/gem_tasks'
33
require 'rake/testtask'
4-
require 'bump/tasks'
54

65
Rake::TestTask.new :default do |test|
76
test.pattern = 'test/**/test_*.rb'

bin/bundle_all

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
#! /bin/bash
2+
# Usage: ./bundle_all <args>
3+
# This will update the lock files
4+
# in the gemfiles/ folder as well
5+
echo "bundle_all"
6+
for i in gemfiles/*.gemfile Gemfile
7+
do
8+
echo "Bundling for $i"
9+
echo "BUNDLE_GEMFILE=$i bundle $@"
10+
BUNDLE_GEMFILE=$i bundle $@
11+
done

gemfiles/common.rb

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
source 'https://rubygems.org'
2+
3+
gemspec path: '../'
4+
5+
gem 'maxitest', '< 5'
6+
gem 'mocha'
7+
gem 'rake'

gemfiles/rails7.0.gemfile

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
eval_gemfile 'common.rb'
2+
3+
gem 'activesupport', '~> 7.0.0'

gemfiles/rails7.0.gemfile.lock

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
PATH
2+
remote: ..
3+
specs:
4+
prop (2.8.0)
5+
6+
GEM
7+
remote: https://rubygems.org/
8+
specs:
9+
activesupport (7.0.8)
10+
concurrent-ruby (~> 1.0, >= 1.0.2)
11+
i18n (>= 1.6, < 2)
12+
minitest (>= 5.1)
13+
tzinfo (~> 2.0)
14+
concurrent-ruby (1.2.2)
15+
i18n (1.14.1)
16+
concurrent-ruby (~> 1.0)
17+
maxitest (4.5.0)
18+
minitest (>= 5.0.0, < 5.19.0)
19+
minitest (5.18.1)
20+
mocha (2.1.0)
21+
ruby2_keywords (>= 0.0.5)
22+
rake (13.1.0)
23+
ruby2_keywords (0.0.5)
24+
tzinfo (2.0.6)
25+
concurrent-ruby (~> 1.0)
26+
27+
PLATFORMS
28+
ruby
29+
30+
DEPENDENCIES
31+
activesupport (~> 7.0.0)
32+
maxitest (< 5)
33+
mocha
34+
prop!
35+
rake
36+
37+
BUNDLED WITH
38+
2.4.22

gemfiles/rails7.1.gemfile

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
eval_gemfile 'common.rb'
2+
3+
gem 'activesupport', '~> 7.1.0'

0 commit comments

Comments
 (0)