Skip to content

Commit 0f990b2

Browse files
authored
Merge pull request #53 from n-rodriguez/wip/appraisal
Test with all supported Rails versions
2 parents 6e31c3a + 5693d25 commit 0f990b2

25 files changed

+622
-107
lines changed

.github/workflows/ci.yml

Lines changed: 63 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,17 @@
11
name: CI
2+
23
on:
34
push:
45
branches-ignore: [master]
56
tags-ignore: [v*]
7+
68
concurrency:
79
group: ${{ github.workflow }}-${{ github.ref }}
810
cancel-in-progress: true
11+
912
jobs:
1013
test:
11-
name: "test (ruby: ${{ matrix.ruby }}, redis.rb: ${{ matrix.redis }})"
14+
name: "test (ruby: ${{ matrix.ruby }}, rails: ${{ matrix.rails }})"
1215
runs-on: ubuntu-latest
1316
continue-on-error: ${{ contains(matrix.ruby, 'head') }}
1417
strategy:
@@ -18,45 +21,77 @@ jobs:
1821
- "2.7"
1922
- "3.0"
2023
- "3.1"
24+
- "3.2"
25+
- "3.3"
2126
# - 'head'
22-
- "jruby"
27+
# - "jruby"
2328
# - 'jruby-head'
24-
- "truffleruby"
29+
# - "truffleruby"
2530
# - 'truffleruby-head'
26-
redis:
27-
- 4_0_x
28-
- 4_1_x
29-
- 4_x
31+
rails:
32+
- rails_8.0
33+
- rails_7.2
34+
- rails_7.1
35+
- rails_7.0
36+
- rails_6.1
37+
- rails_6.0
38+
- rails_5.2
39+
- rails_5.1
40+
- rails_5.0
41+
42+
exclude:
43+
- ruby: '2.7'
44+
rails: 'rails_7.2'
45+
- ruby: '2.7'
46+
rails: 'rails_8.0'
47+
48+
- ruby: '3.0'
49+
rails: 'rails_5.0'
50+
- ruby: '3.0'
51+
rails: 'rails_5.1'
52+
- ruby: '3.0'
53+
rails: 'rails_5.2'
54+
- ruby: '3.0'
55+
rails: 'rails_7.2'
56+
- ruby: '3.0'
57+
rails: 'rails_8.0'
58+
59+
- ruby: '3.1'
60+
rails: 'rails_5.0'
61+
- ruby: '3.1'
62+
rails: 'rails_5.1'
63+
- ruby: '3.1'
64+
rails: 'rails_5.2'
65+
- ruby: '3.1'
66+
rails: 'rails_8.0'
67+
68+
- ruby: '3.2'
69+
rails: 'rails_5.0'
70+
- ruby: '3.2'
71+
rails: 'rails_5.1'
72+
- ruby: '3.2'
73+
rails: 'rails_5.2'
74+
75+
- ruby: '3.3'
76+
rails: 'rails_5.0'
77+
- ruby: '3.3'
78+
rails: 'rails_5.1'
79+
- ruby: '3.3'
80+
rails: 'rails_5.2'
81+
3082
env:
31-
BUNDLE_GEMFILE: ${{ github.workspace }}/gemfiles/redis_${{ matrix.redis }}.gemfile
83+
BUNDLE_GEMFILE: ${{ github.workspace }}/gemfiles/${{ matrix.rails }}.gemfile
84+
3285
services:
3386
redis:
3487
image: redis
3588
ports:
3689
- 6379:6379
37-
distributed1:
38-
image: redis
39-
ports:
40-
- 6380:6380
41-
distributed2:
42-
image: redis
43-
ports:
44-
- 6381:6381
90+
4591
steps:
46-
- uses: actions/checkout@v3
92+
- uses: actions/checkout@v4
4793
- uses: ruby/setup-ruby@v1
4894
with:
4995
ruby-version: ${{ matrix.ruby }}
5096
bundler-cache: true
5197
- run: bundle exec rake
52-
lint:
53-
runs-on: ubuntu-latest
54-
steps:
55-
- uses: actions/checkout@v3
56-
with:
57-
fetch-depth: 0
58-
- uses: ruby/setup-ruby@v1
59-
with:
60-
ruby-version: 3.1
61-
bundler-cache: true
62-
- run: bundle exec rake lint

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,3 +4,4 @@ gemfiles/*.lock
44
tmp/
55
stdout
66
gemfiles/vendor
7+
.DS_Store

Appraisals

Lines changed: 46 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,64 @@
1-
appraise 'rails-5.0.x' do
1+
# frozen_string_literal: true
2+
3+
appraise 'rails_5.0' do
24
gem 'redis-store'
35
gem 'redis-rack'
46
gem 'actionpack', '~> 5.0.0'
7+
gem 'tzinfo', '~> 1.2'
58
end
69

7-
appraise 'rails-5.1.x' do
10+
appraise 'rails_5.1' do
811
gem 'redis-store'
912
gem 'redis-rack'
1013
gem 'actionpack', '~> 5.1.0'
14+
gem 'tzinfo', '~> 1.2'
1115
end
1216

13-
appraise 'rails-5.2.x' do
17+
appraise 'rails_5.2' do
1418
gem 'redis-store'
1519
gem 'redis-rack'
16-
gem 'actionpack', '~> 5.1.0'
20+
gem 'actionpack', '~> 5.2.0'
21+
gem 'tzinfo', '~> 1.2'
1722
end
1823

19-
appraise 'rails-6.0.x' do
24+
appraise 'rails_6.0' do
2025
gem 'redis-store'
2126
gem 'redis-rack'
2227
gem 'actionpack', '~> 6.0.0'
28+
gem 'tzinfo', '~> 1.2'
29+
end
30+
31+
appraise 'rails_6.1' do
32+
gem 'redis-store'
33+
gem 'redis-rack'
34+
gem 'actionpack', '~> 6.1.0'
35+
end
36+
37+
appraise 'rails_7.0' do
38+
gem 'redis-store'
39+
gem 'redis-rack'
40+
gem 'actionpack', '~> 7.0.0'
41+
end
42+
43+
appraise 'rails_7.1' do
44+
gem 'redis-store'
45+
gem 'redis-rack'
46+
gem 'actionpack', '~> 7.1.0'
47+
end
48+
49+
appraise 'rails_7.2' do
50+
gem 'redis-store'
51+
gem 'redis-rack'
52+
gem 'actionpack', '~> 7.2.0'
53+
end
54+
55+
appraise 'rails_8.0' do
56+
gem 'redis-store'
57+
gem 'redis-rack'
58+
gem 'actionpack', '~> 8.0.0'
59+
60+
# TODO: remove me when one of this PR is merged:
61+
# * https://github.com/minitest/minitest-rails/pull/258
62+
# * https://github.com/minitest/minitest-rails/pull/259
63+
gem 'minitest-rails', git: 'https://github.com/n-rodriguez/minitest-rails.git', branch: 'wip/rails8'
2364
end

Gemfile

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,13 @@
1+
# frozen_string_literal: true
2+
13
source 'https://rubygems.org'
24
gemspec
35

4-
gem 'rake', '>= 12.3.3'
5-
gem 'bundler', '~> 2.1'
6+
gem 'appraisal', git: 'https://github.com/thoughtbot/appraisal.git'
7+
8+
gem 'cgi'
9+
gem 'minitest-rails'
610
gem 'mocha', '~> 0.14.0', require: 'mocha/setup'
7-
gem 'tzinfo', '~> 1.2'
8-
gem 'appraisal', '~> 2.2'
11+
gem 'rake', '>= 12.3.3'
912
gem 'redis-store-testing', github: 'redis-store/testing'
10-
gem 'minitest-rails'
13+
gem 'tzinfo'

README.md

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
# Redis stores for ActionPack
22

3+
[![Gem Version](https://badge.fury.io/rb/redis-actionpack.svg)](http://badge.fury.io/rb/redis-actionpack)
4+
[![Build Status](https://github.com/redis-store/redis-actionpack/workflows/CI/badge.svg)](https://github.com/redis-store/redis-actionpack/actions)
5+
[![Code Climate](https://codeclimate.com/github/redis-store/redis-actionpack.svg)](https://codeclimate.com/github/redis-store/redis-actionpack)
6+
37
__`redis-actionpack`__ provides a session store for __ActionPack__, specifically for __ActionDispatch__. See the main [redis-store readme](https://github.com/redis-store/redis-store) for general guidelines.
48

59
For guidelines on using our underlying cache store, see the main [redis-store readme](https://github.com/redis-store/redis-store).
@@ -58,12 +62,6 @@ bundle exec rake
5862

5963
If you are on **Snow Leopard** you have to run `env ARCHFLAGS="-arch x86_64" bundle exec rake`
6064

61-
## Status
62-
63-
[![Gem Version](https://badge.fury.io/rb/redis-actionpack.svg)](http://badge.fury.io/rb/redis-actionpack)
64-
[![Build Status](https://secure.travis-ci.org/redis-store/redis-actionpack.svg?branch=master)](http://travis-ci.org/redis-store/redis-actionpack?branch=master)
65-
[![Code Climate](https://codeclimate.com/github/redis-store/redis-actionpack.svg)](https://codeclimate.com/github/redis-store/redis-actionpack)
66-
6765
## Copyright
6866

6967
2009 - 2013 Luca Guidi - [http://lucaguidi.com](http://lucaguidi.com), released under the MIT license

Rakefile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
# frozen_string_literal: true
2+
13
require 'bundler/setup'
24
require 'rake'
35
require 'bundler/gem_tasks'

bin/bundler-version-options.rb

Lines changed: 0 additions & 1 deletion
This file was deleted.

gemfiles/rails_5.0.x.gemfile renamed to gemfiles/rails_5.0.gemfile

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@
22

33
source "https://rubygems.org"
44

5-
gem "rake", ">= 12.3.3"
6-
gem "bundler", "~> 2.1"
5+
gem "appraisal", git: "https://github.com/thoughtbot/appraisal.git"
6+
gem "cgi"
7+
gem "minitest-rails"
78
gem "mocha", "~> 0.14.0", require: "mocha/setup"
8-
gem "tzinfo", "~> 1.2"
9-
gem "appraisal", "~> 2.2"
9+
gem "rake", ">= 12.3.3"
1010
gem "redis-store-testing", github: "redis-store/testing"
11-
gem "minitest-rails"
11+
gem "tzinfo", "~> 1.2"
1212
gem "redis-store"
1313
gem "redis-rack"
1414
gem "actionpack", "~> 5.0.0"

gemfiles/rails_5.1.x.gemfile renamed to gemfiles/rails_5.1.gemfile

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@
22

33
source "https://rubygems.org"
44

5-
gem "rake", ">= 12.3.3"
6-
gem "bundler", "~> 2.1"
5+
gem "appraisal", git: "https://github.com/thoughtbot/appraisal.git"
6+
gem "cgi"
7+
gem "minitest-rails"
78
gem "mocha", "~> 0.14.0", require: "mocha/setup"
8-
gem "tzinfo", "~> 1.2"
9-
gem "appraisal", "~> 2.2"
9+
gem "rake", ">= 12.3.3"
1010
gem "redis-store-testing", github: "redis-store/testing"
11-
gem "minitest-rails"
11+
gem "tzinfo", "~> 1.2"
1212
gem "redis-store"
1313
gem "redis-rack"
1414
gem "actionpack", "~> 5.1.0"

gemfiles/rails_5.2.x.gemfile renamed to gemfiles/rails_5.2.gemfile

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,15 @@
22

33
source "https://rubygems.org"
44

5-
gem "rake", ">= 12.3.3"
6-
gem "bundler", "~> 2.1"
5+
gem "appraisal", git: "https://github.com/thoughtbot/appraisal.git"
6+
gem "cgi"
7+
gem "minitest-rails"
78
gem "mocha", "~> 0.14.0", require: "mocha/setup"
8-
gem "tzinfo", "~> 1.2"
9-
gem "appraisal", "~> 2.2"
9+
gem "rake", ">= 12.3.3"
1010
gem "redis-store-testing", github: "redis-store/testing"
11-
gem "minitest-rails"
11+
gem "tzinfo", "~> 1.2"
1212
gem "redis-store"
1313
gem "redis-rack"
14-
gem "actionpack", "~> 5.1.0"
14+
gem "actionpack", "~> 5.2.0"
1515

1616
gemspec path: "../"

0 commit comments

Comments
 (0)