From 0c54f121e5c101e2f38ac9a08e8585349bbb728b Mon Sep 17 00:00:00 2001 From: Patrick Oscity Date: Wed, 11 Sep 2024 23:38:57 +0200 Subject: [PATCH 1/3] Add rails versions to CI matrix --- .github/workflows/head.yml | 9 ++++++--- .github/workflows/test.yml | 22 +++++++++++++++------- Gemfile | 11 +++++++++-- 3 files changed, 30 insertions(+), 12 deletions(-) diff --git a/.github/workflows/head.yml b/.github/workflows/head.yml index bd598a4..08bf52e 100644 --- a/.github/workflows/head.yml +++ b/.github/workflows/head.yml @@ -8,11 +8,12 @@ jobs: fail-fast: false matrix: entry: - - { ruby: "3.2", grape-swagger: "HEAD" } - - { ruby: "ruby-head", grape-swagger: "HEAD" } - - { ruby: "jruby-head", grape-swagger: "HEAD" } + - { ruby: "3.2", rails: "edge", grape-swagger: "HEAD" } + - { ruby: "ruby-head", rails: "edge", grape-swagger: "HEAD" } + - { ruby: "jruby-head", rails: "edge", grape-swagger: "HEAD" } env: GRAPE_SWAGGER_VERSION: ${{ matrix.entry.grape-swagger }} + RAILS_VERSION: ${{ matrix.entry.rails }} steps: - uses: actions/checkout@v3 - name: Set up Ruby @@ -20,6 +21,8 @@ jobs: with: ruby-version: ${{ matrix.entry.ruby }} bundler-cache: true + - name: Print Bundler Versions + run: bundle show - name: Setup Firefox uses: browser-actions/setup-firefox@v1 with: diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 65194d9..a7d7ce4 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -7,15 +7,21 @@ jobs: fail-fast: false matrix: entry: - - { ruby: "2.7", grape-swagger: "1.6.1" } - - { ruby: "3.0", grape-swagger: "1.6.1" } - - { ruby: "3.1", grape-swagger: "1.6.1" } - - { ruby: "3.2", grape-swagger: "1.6.1" } - - { ruby: "3.2", grape-swagger: "2.0.2" } - - { ruby: "jruby-9.4.6", grape-swagger: "1.6.1" } - - { ruby: "jruby-9.4.6", grape-swagger: "2.0.2" } + - { ruby: "2.7", rails: "6.1.7", grape-swagger: "1.6.1" } + - { ruby: "3.0", rails: "6.1.7", grape-swagger: "1.6.1" } + - { ruby: "3.1", rails: "6.1.7", grape-swagger: "1.6.1" } + - { ruby: "3.1", rails: "7.2.1", grape-swagger: "1.6.1" } + - { ruby: "3.2", rails: "6.1.7", grape-swagger: "1.6.1" } + - { ruby: "3.2", rails: "6.1.7", grape-swagger: "2.0.2" } + - { ruby: "3.2", rails: "7.2.1", grape-swagger: "1.6.1" } + - { ruby: "3.2", rails: "7.2.1", grape-swagger: "2.0.2" } + - { ruby: "jruby-9.4.6", rails: "6.1.7", grape-swagger: "1.6.1" } + - { ruby: "jruby-9.4.6", rails: "6.1.7", grape-swagger: "2.0.2" } + - { ruby: "jruby-9.4.6", rails: "7.2.1", grape-swagger: "1.6.1" } + - { ruby: "jruby-9.4.6", rails: "7.2.1", grape-swagger: "2.0.2" } env: GRAPE_SWAGGER_VERSION: ${{ matrix.entry.grape-swagger }} + RAILS_VERSION: ${{ matrix.entry.rails }} steps: - uses: actions/checkout@v3 - name: Set up Ruby @@ -23,6 +29,8 @@ jobs: with: ruby-version: ${{ matrix.entry.ruby }} bundler-cache: true + - name: Print Bundler Versions + run: bundle show - name: Setup Firefox uses: browser-actions/setup-firefox@v1 with: diff --git a/Gemfile b/Gemfile index 08b55a0..ad879fd 100644 --- a/Gemfile +++ b/Gemfile @@ -4,12 +4,19 @@ source 'https://rubygems.org' gemspec -case version = ENV['GRAPE_SWAGGER_VERSION'] || '~> 1.6.0' +case grape_swagger_version = ENV.fetch('GRAPE_SWAGGER_VERSION', '~> 1.6.0') when 'HEAD' gem 'grape-swagger', github: 'ruby-grape/grape-swagger' else gem 'grape', '>= 1.3.0' - gem 'grape-swagger', version + gem 'grape-swagger', grape_swagger_version +end + +case rails_version = ENV.fetch('RAILS_VERSION', '>= 6.0.6.1') +when 'edge' + gem 'railties', github: 'rails/rails', branch: 'main' +else + gem 'railties', rails_version end group :development, :test do From 47b574ba99407055e83bd65a77b8035298d23829 Mon Sep 17 00:00:00 2001 From: Patrick Oscity Date: Sat, 21 Sep 2024 13:33:20 +0200 Subject: [PATCH 2/3] Update changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index bb165f2..91c51ae 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,7 @@ ### 0.5.1 (Next) * [#124](https://github.com/ruby-grape/grape-swagger-rails/pull/124): Rails 7 compatibility - [@padde](https://github.com/padde). +* [#125](https://github.com/ruby-grape/grape-swagger-rails/pull/125): Add rails versions to CI matrix - [@padde](https://github.com/padde). * Your contribution here. ### 0.5.0 (2024/04/06) From 3d63550d1bb3994909062f7c6034fbac1388ff2b Mon Sep 17 00:00:00 2001 From: Patrick Oscity Date: Sat, 21 Sep 2024 13:40:11 +0200 Subject: [PATCH 3/3] Bump grape-swagger to 2.1.1 --- .github/workflows/test.yml | 8 ++++---- README.md | 2 ++ 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index a7d7ce4..c3d6596 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -12,13 +12,13 @@ jobs: - { ruby: "3.1", rails: "6.1.7", grape-swagger: "1.6.1" } - { ruby: "3.1", rails: "7.2.1", grape-swagger: "1.6.1" } - { ruby: "3.2", rails: "6.1.7", grape-swagger: "1.6.1" } - - { ruby: "3.2", rails: "6.1.7", grape-swagger: "2.0.2" } + - { ruby: "3.2", rails: "6.1.7", grape-swagger: "2.1.1" } - { ruby: "3.2", rails: "7.2.1", grape-swagger: "1.6.1" } - - { ruby: "3.2", rails: "7.2.1", grape-swagger: "2.0.2" } + - { ruby: "3.2", rails: "7.2.1", grape-swagger: "2.1.1" } - { ruby: "jruby-9.4.6", rails: "6.1.7", grape-swagger: "1.6.1" } - - { ruby: "jruby-9.4.6", rails: "6.1.7", grape-swagger: "2.0.2" } + - { ruby: "jruby-9.4.6", rails: "6.1.7", grape-swagger: "2.1.1" } - { ruby: "jruby-9.4.6", rails: "7.2.1", grape-swagger: "1.6.1" } - - { ruby: "jruby-9.4.6", rails: "7.2.1", grape-swagger: "2.0.2" } + - { ruby: "jruby-9.4.6", rails: "7.2.1", grape-swagger: "2.1.1" } env: GRAPE_SWAGGER_VERSION: ${{ matrix.entry.grape-swagger }} RAILS_VERSION: ${{ matrix.entry.rails }} diff --git a/README.md b/README.md index 4361aa4..8e7800f 100644 --- a/README.md +++ b/README.md @@ -49,6 +49,8 @@ grape | grape-swagger 0.9.0 | 0.8.0 0.10.0 | 0.9.0 0.16.2 | 0.20.2 +1.8.0 | 1.6.1 +2.2.0 | 2.1.1 ## Usage