Skip to content

Commit 2ec60d7

Browse files
committed
Add rails versions to CI matrix
1 parent bedc9f3 commit 2ec60d7

File tree

5 files changed

+33
-19
lines changed

5 files changed

+33
-19
lines changed

.github/workflows/head.yml

+8-6
Original file line numberDiff line numberDiff line change
@@ -7,19 +7,21 @@ jobs:
77
strategy:
88
fail-fast: false
99
matrix:
10-
entry:
11-
- { ruby: "3.2", grape-swagger: "HEAD" }
12-
- { ruby: "ruby-head", grape-swagger: "HEAD" }
13-
- { ruby: "jruby-head", grape-swagger: "HEAD" }
10+
ruby: ["3.2", "ruby-head", "jruby-head"]
11+
rails: ["edge"]
12+
grape-swagger: ["HEAD"]
1413
env:
15-
GRAPE_SWAGGER_VERSION: ${{ matrix.entry.grape-swagger }}
14+
GRAPE_SWAGGER_VERSION: ${{ matrix.grape-swagger }}
15+
RAILS_VERSION: ${{ matrix.rails }}
1616
steps:
1717
- uses: actions/checkout@v3
1818
- name: Set up Ruby
1919
uses: ruby/setup-ruby@v1
2020
with:
21-
ruby-version: ${{ matrix.entry.ruby }}
21+
ruby-version: ${{ matrix.ruby }}
2222
bundler-cache: true
23+
- name: Print Bundler Versions
24+
run: bundle show
2325
- name: Setup Firefox
2426
uses: browser-actions/setup-firefox@v1
2527
with:

.github/workflows/test.yml

+15-10
Original file line numberDiff line numberDiff line change
@@ -6,23 +6,28 @@ jobs:
66
strategy:
77
fail-fast: false
88
matrix:
9-
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" }
9+
ruby: ["3.1", "3.2", "jruby-9.4.6"]
10+
rails: ["6.1.7", "7.2.1"]
11+
grape-swagger: ["1.6.1", "2.0.2"]
12+
include:
13+
- ruby: "2.7"
14+
rails: "6.1.7"
15+
grape-swagger: "1.6.1"
16+
- ruby: "3.0"
17+
rails: "6.1.7"
18+
grape-swagger: "1.6.1"
1719
env:
18-
GRAPE_SWAGGER_VERSION: ${{ matrix.entry.grape-swagger }}
20+
GRAPE_SWAGGER_VERSION: ${{ matrix.grape-swagger }}
21+
RAILS_VERSION: ${{ matrix.rails }}
1922
steps:
2023
- uses: actions/checkout@v3
2124
- name: Set up Ruby
2225
uses: ruby/setup-ruby@v1
2326
with:
24-
ruby-version: ${{ matrix.entry.ruby }}
27+
ruby-version: ${{ matrix.ruby }}
2528
bundler-cache: true
29+
- name: Print Bundler Versions
30+
run: bundle show
2631
- name: Setup Firefox
2732
uses: browser-actions/setup-firefox@v1
2833
with:

CHANGELOG.md

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

3+
* [#0](https://github.com/ruby-grape/grape-swagger-rails/pull/TODO): Add rails versions to CI matrix - [@padde](https://github.com/padde).
34
* Your contribution here.
45

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

Gemfile

+4-2
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,16 @@ 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
1313
end
1414

15+
gem 'railties', github: 'rails/rails', branch: 'main' if ENV['RAILS_VERSION'] == 'edge'
16+
1517
group :development, :test do
1618
gem 'capybara'
1719
gem 'grape-swagger-ui'

grape-swagger-rails.gemspec

+5-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,11 @@ Gem::Specification.new do |spec|
1515
spec.license = 'MIT'
1616
spec.files = `git ls-files`.split($INPUT_RECORD_SEPARATOR)
1717
spec.require_paths = %w[lib]
18-
spec.add_dependency 'railties', '>= 6.0.6.1'
18+
19+
rails_version = ENV.fetch('RAILS_VERSION', '>= 6.0.6.1')
20+
rails_version = '>= 0' if rails_version == 'edge'
21+
spec.add_dependency 'railties', rails_version
22+
1923
spec.metadata = {
2024
'bug_tracker_uri' => 'https://github.com/ruby-grape/grape-swagger-rails/issues',
2125
'changelog_uri' => 'https://github.com/ruby-grape/grape-swagger-rails/blob/master/CHANGELOG.md',

0 commit comments

Comments
 (0)