Skip to content

Commit 30ab24f

Browse files
authored
Add rails versions to CI matrix (#125)
* Add rails versions to CI matrix * Update changelog * Bump grape-swagger to 2.1.1
1 parent bde8b9b commit 30ab24f

File tree

5 files changed

+33
-12
lines changed

5 files changed

+33
-12
lines changed

.github/workflows/head.yml

+6-3
Original file line numberDiff line numberDiff line change
@@ -8,18 +8,21 @@ jobs:
88
fail-fast: false
99
matrix:
1010
entry:
11-
- { ruby: "3.2", grape-swagger: "HEAD" }
12-
- { ruby: "ruby-head", grape-swagger: "HEAD" }
13-
- { ruby: "jruby-head", grape-swagger: "HEAD" }
11+
- { ruby: "3.2", rails: "edge", grape-swagger: "HEAD" }
12+
- { ruby: "ruby-head", rails: "edge", grape-swagger: "HEAD" }
13+
- { ruby: "jruby-head", rails: "edge", grape-swagger: "HEAD" }
1414
env:
1515
GRAPE_SWAGGER_VERSION: ${{ matrix.entry.grape-swagger }}
16+
RAILS_VERSION: ${{ matrix.entry.rails }}
1617
steps:
1718
- uses: actions/checkout@v3
1819
- name: Set up Ruby
1920
uses: ruby/setup-ruby@v1
2021
with:
2122
ruby-version: ${{ matrix.entry.ruby }}
2223
bundler-cache: true
24+
- name: Print Bundler Versions
25+
run: bundle show
2326
- name: Setup Firefox
2427
uses: browser-actions/setup-firefox@v1
2528
with:

.github/workflows/test.yml

+15-7
Original file line numberDiff line numberDiff line change
@@ -7,22 +7,30 @@ jobs:
77
fail-fast: false
88
matrix:
99
entry:
10-
- { ruby: "2.7", grape-swagger: "1.6.1" }
11-
- { ruby: "3.0", grape-swagger: "1.6.1" }
12-
- { ruby: "3.1", grape-swagger: "1.6.1" }
13-
- { ruby: "3.2", grape-swagger: "1.6.1" }
14-
- { ruby: "3.2", grape-swagger: "2.0.2" }
15-
- { ruby: "jruby-9.4.6", grape-swagger: "1.6.1" }
16-
- { ruby: "jruby-9.4.6", grape-swagger: "2.0.2" }
10+
- { ruby: "2.7", rails: "6.1.7", grape-swagger: "1.6.1" }
11+
- { ruby: "3.0", rails: "6.1.7", grape-swagger: "1.6.1" }
12+
- { ruby: "3.1", rails: "6.1.7", grape-swagger: "1.6.1" }
13+
- { ruby: "3.1", rails: "7.2.1", grape-swagger: "1.6.1" }
14+
- { ruby: "3.2", rails: "6.1.7", grape-swagger: "1.6.1" }
15+
- { ruby: "3.2", rails: "6.1.7", grape-swagger: "2.1.1" }
16+
- { ruby: "3.2", rails: "7.2.1", grape-swagger: "1.6.1" }
17+
- { ruby: "3.2", rails: "7.2.1", grape-swagger: "2.1.1" }
18+
- { ruby: "jruby-9.4.6", rails: "6.1.7", grape-swagger: "1.6.1" }
19+
- { ruby: "jruby-9.4.6", rails: "6.1.7", grape-swagger: "2.1.1" }
20+
- { ruby: "jruby-9.4.6", rails: "7.2.1", grape-swagger: "1.6.1" }
21+
- { ruby: "jruby-9.4.6", rails: "7.2.1", grape-swagger: "2.1.1" }
1722
env:
1823
GRAPE_SWAGGER_VERSION: ${{ matrix.entry.grape-swagger }}
24+
RAILS_VERSION: ${{ matrix.entry.rails }}
1925
steps:
2026
- uses: actions/checkout@v3
2127
- name: Set up Ruby
2228
uses: ruby/setup-ruby@v1
2329
with:
2430
ruby-version: ${{ matrix.entry.ruby }}
2531
bundler-cache: true
32+
- name: Print Bundler Versions
33+
run: bundle show
2634
- name: Setup Firefox
2735
uses: browser-actions/setup-firefox@v1
2836
with:

CHANGELOG.md

+1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
### 0.5.1 (Next)
22

33
* [#124](https://github.com/ruby-grape/grape-swagger-rails/pull/124): Rails 7 compatibility - [@padde](https://github.com/padde).
4+
* [#125](https://github.com/ruby-grape/grape-swagger-rails/pull/125): Add rails versions to CI matrix - [@padde](https://github.com/padde).
45
* Your contribution here.
56

67
### 0.5.0 (2024/04/06)

Gemfile

+9-2
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,19 @@ source 'https://rubygems.org'
44

55
gemspec
66

7-
case version = ENV['GRAPE_SWAGGER_VERSION'] || '~> 1.6.0'
7+
case grape_swagger_version = ENV.fetch('GRAPE_SWAGGER_VERSION', '~> 1.6.0')
88
when 'HEAD'
99
gem 'grape-swagger', github: 'ruby-grape/grape-swagger'
1010
else
1111
gem 'grape', '>= 1.3.0'
12-
gem 'grape-swagger', version
12+
gem 'grape-swagger', grape_swagger_version
13+
end
14+
15+
case rails_version = ENV.fetch('RAILS_VERSION', '>= 6.0.6.1')
16+
when 'edge'
17+
gem 'railties', github: 'rails/rails', branch: 'main'
18+
else
19+
gem 'railties', rails_version
1320
end
1421

1522
group :development, :test do

README.md

+2
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,8 @@ grape | grape-swagger
4949
0.9.0 | 0.8.0
5050
0.10.0 | 0.9.0
5151
0.16.2 | 0.20.2
52+
1.8.0 | 1.6.1
53+
2.2.0 | 2.1.1
5254

5355
## Usage
5456

0 commit comments

Comments
 (0)