Skip to content

Commit

Permalink
Merge branch 'master' into rubocop-challenge/20240209233127
Browse files Browse the repository at this point in the history
  • Loading branch information
mathieujobin authored May 30, 2024
2 parents b6e474c + 26a2807 commit 78f6a01
Show file tree
Hide file tree
Showing 36 changed files with 2,372 additions and 2,073 deletions.
7 changes: 4 additions & 3 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,10 @@ jobs:
fail-fast: false
matrix:
rails: ["7.1", "7.0", "6.1", "6.0"]
ruby: ["3.3.0", "3.2.2", "3.1.4", "3.0.6", "2.7.8"]
ruby: ["3.3", "3.2", "3.1", "3.0", "2.7"]
include:
- rails: "7.1"
ruby: "3.4.0-preview1"
- rails: "5.2"
ruby: "2.7.8"
- rails: "5.1"
Expand All @@ -19,11 +21,10 @@ jobs:
ruby: "2.6.10"

env:
RUBY_VERSION: ${{ matrix.ruby }}
RAILS_VERSION: ${{ matrix.rails }}

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
- uses: ruby/setup-ruby@v1
with:
ruby-version: ${{ matrix.ruby }}
Expand Down
4 changes: 1 addition & 3 deletions .github/workflows/rubocop-challenger.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,8 @@ jobs:
create-pr:
name: Create Pull Request
runs-on: ubuntu-latest
env:
RUBY_VERSION: 3.2.3
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
- name: Set up Ruby 3.2
uses: ruby/setup-ruby@v1
with:
Expand Down
4 changes: 1 addition & 3 deletions .github/workflows/rubocop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,8 @@ on: [push, pull_request]
jobs:
build:
runs-on: ubuntu-latest
env:
RUBY_VERSION: 3.2.3
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Set up Ruby 3.2
uses: ruby/setup-ruby@v1
Expand Down
16 changes: 1 addition & 15 deletions .rubocop_todo.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# This configuration was generated by
# `rubocop --auto-gen-config --exclude-limit 180`
# on 2024-02-09 23:31:57 UTC using RuboCop version 1.60.2.
# on 2024-02-19 23:31:58 UTC using RuboCop version 1.60.2.
# The point is for the user to remove these configuration records
# one by one as the offenses are removed from the code base.
# Note that changes in the inspected code, or installation of new
Expand Down Expand Up @@ -377,13 +377,6 @@ Layout/IndentationWidth:
- 'lib/apipie/resource_description.rb'
- 'lib/tasks/apipie.rake'

# Offense count: 2
# This cop supports safe autocorrection (--autocorrect).
Layout/InitialIndentation:
Exclude:
- 'spec/dummy/app/controllers/extending_concern.rb'
- 'spec/dummy/app/controllers/sample_controller.rb'

# Offense count: 15
# This cop supports safe autocorrection (--autocorrect).
# Configuration parameters: AllowDoxygenCommentStyle, AllowGemfileRubyComment.
Expand Down Expand Up @@ -905,13 +898,6 @@ Performance/RedundantMerge:
- 'lib/apipie/generator/swagger/param_description/type.rb'
- 'lib/apipie/middleware/checksum_in_headers.rb'

# Offense count: 7
# This cop supports safe autocorrection (--autocorrect).
Performance/RegexpMatch:
Exclude:
- 'lib/apipie/extractor/writer.rb'
- 'lib/apipie/helpers.rb'

# Offense count: 7
# This cop supports safe autocorrection (--autocorrect).
Performance/StringIdentifierArgument:
Expand Down
13 changes: 13 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,19 @@
Changelog
===========

## [v1.4.0](https://github.com/Apipie/apipie-rails/tree/v1.4.0) (2024-05-30)
[Full Changelog](https://github.com/Apipie/apipie-rails/compare/v1.3.0...v1.4.0)
* Add Ruby 3.3.0 to CI build matrix (#906) Masato Nakamura
* Fix rubocop CI (#910) (Masato Nakamura)
* Add metadata for rubygems.org and use https URLs (#909) (Masato Nakamura)
* Bump GHA actions/checkout to be on node20 by default (#911) (Masato Nakamura)
* Convert readme to markdown (#920) (Panos Dalitsouris)
* Fix typos, Found via `codespell` (#921) (Kian-Meng Ang)
* Bump ruby versions on test jobs (#927) (Masato Nakamura)
* Support for Ruby 3.4.0-preview1 (#929) (Masato Nakamura)
* Add "blank allowed" message to api doc (#926) (Peko)
* Custom headers responses (#924) (Panos Dalitsouris)

## [v1.3.0](https://github.com/Apipie/apipie-rails/tree/v1.3.0) (2023-12-19)
[Full Changelog](https://github.com/Apipie/apipie-rails/compare/v1.2.3...v1.3.0)
* rubocop fixes ([#897](https://github.com/Apipie/apipie-rails/pull/897)) (Mathieu Jobin)
Expand Down
5 changes: 2 additions & 3 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,8 @@ source 'https://rubygems.org'
gemspec path: '.'

# use ENV vars, with default value as fallback for local setup
ruby(ENV['RUBY_VERSION'] || '3.2.2')
gem 'actionpack', "~> #{ENV['RAILS_VERSION'] || '7.0'}.0"
gem 'activesupport', "~> #{ENV['RAILS_VERSION'] || '7.0'}.0"
gem 'actionpack', "~> #{ENV['RAILS_VERSION'] || '7.1'}.0"
gem 'activesupport', "~> #{ENV['RAILS_VERSION'] || '7.1'}.0"

gem 'mime-types' # , '~> 3.0'
gem 'rails-controller-testing'
Expand Down
Loading

0 comments on commit 78f6a01

Please sign in to comment.