Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Preparing release with Rails 7.1 support #269

Merged
merged 5 commits into from
Oct 5, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
86 changes: 81 additions & 5 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -271,7 +271,7 @@ jobs:
environment:
BUNDLE_GEMFILE: gemfiles/rails_7.0.gemfile
ENABLE_CODE_COVERAGE: 1
NO_STEEP: 0
NO_STEEP: 1
working_directory: ~/meta-tags/ruby31-rails-70
steps: *shared_build_steps

Expand All @@ -289,18 +289,74 @@ jobs:
working_directory: ~/meta-tags/ruby31-rails-71
steps: *shared_build_steps

build-ruby32-rails-60:
parameters:
is_main_build:
type: boolean
default: false
docker:
- image: cimg/ruby:3.2
environment:
BUNDLE_GEMFILE: gemfiles/rails_6.0.gemfile
ENABLE_CODE_COVERAGE: 1
NO_STEEP: 1
working_directory: ~/meta-tags/ruby32-rails-60
steps: *shared_build_steps

build-ruby32-rails-61:
parameters:
is_main_build:
type: boolean
default: false
docker:
- image: cimg/ruby:3.2
environment:
BUNDLE_GEMFILE: gemfiles/rails_6.1.gemfile
ENABLE_CODE_COVERAGE: 1
NO_STEEP: 1
working_directory: ~/meta-tags/ruby32-rails-61
steps: *shared_build_steps

build-ruby32-rails-70:
parameters:
is_main_build:
type: boolean
default: false
docker:
- image: cimg/ruby:3.2
environment:
BUNDLE_GEMFILE: gemfiles/rails_7.0.gemfile
ENABLE_CODE_COVERAGE: 1
NO_STEEP: 1
working_directory: ~/meta-tags/ruby32-rails-70
steps: *shared_build_steps

build-ruby32-rails-71:
parameters:
is_main_build:
type: boolean
default: false
docker:
- image: cimg/ruby:3.2
environment:
BUNDLE_GEMFILE: gemfiles/rails_7.1.gemfile
ENABLE_CODE_COVERAGE: 1
NO_STEEP: 0
working_directory: ~/meta-tags/ruby32-rails-71
steps: *shared_build_steps


upload-coverage:
docker:
- image: cimg/ruby:3.1
- image: cimg/ruby:3.2
steps:
- attach_workspace:
at: /tmp/workspace

- run:
name: Uploading Code Coverage
command: |
cd /tmp/workspace/ruby31-rails-70
cd /tmp/workspace/ruby32-rails-71
./cc-test-reporter upload-coverage --input coverage/codeclimate.coverage.json || true
tests:
docker:
Expand Down Expand Up @@ -352,15 +408,27 @@ workflows:
is_main_build: false

- build-ruby31-rails-70:
is_main_build: true
is_main_build: false

- build-ruby31-rails-71:
is_main_build: false

- build-ruby32-rails-60:
is_main_build: false

- build-ruby32-rails-61:
is_main_build: false

- build-ruby32-rails-70:
is_main_build: false

- build-ruby32-rails-71:
is_main_build: true


- upload-coverage:
requires:
- build-ruby31-rails-70
- build-ruby32-rails-71

- tests:
requires:
Expand Down Expand Up @@ -393,3 +461,11 @@ workflows:

- build-ruby31-rails-71

- build-ruby32-rails-60

- build-ruby32-rails-61

- build-ruby32-rails-70

- build-ruby32-rails-71

8 changes: 7 additions & 1 deletion .circleci/config.yml.erb
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,14 @@
# 3.1
%w[3.1 6.0],
%w[3.1 6.1],
["3.1", "7.0", true],
%w[3.1 7.0],
%w[3.1 7.1],

# 3.2
%w[3.2 6.0],
%w[3.2 6.1],
%w[3.2 7.0],
["3.2", "7.1", true],
]

main_build = builds.find { |_, _, is_main_build| is_main_build }
Expand Down
2 changes: 1 addition & 1 deletion Appraisals
Original file line number Diff line number Diff line change
Expand Up @@ -21,5 +21,5 @@ appraise "rails-7.0" do
end

appraise "rails-7.1" do
gem "railties", github: "rails"
gem "railties", "7.1.0"
end
3 changes: 2 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
# Changelog

## 2.19.0 (Development)
## 2.19.0 (October 5, 2023) [☰](https://github.com/kpumuk/meta-tags/compare/v2.18.0...v2.19.0)

Changes:

- Switched code style from custom rules to Standard ([246](https://github.com/kpumuk/meta-tags/pull/251)).
- Switched from testing Rails using environment variables to Appraisal gem ([251](https://github.com/kpumuk/meta-tags/pull/247)).
- Ruby 2.7 is minimum supported version ([257](https://github.com/kpumuk/meta-tags/pull/257/))
- Added support for Rails 7.1 ([267](https://github.com/kpumuk/meta-tags/pull/267))

## 2.18.0 (September 15, 2022) [☰](https://github.com/kpumuk/meta-tags/compare/v2.17.0...v2.18.0)

Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ Search Engine Optimization (SEO) plugin for Ruby on Rails applications.
## Ruby on Rails

MetaTags main branch fully supports Ruby on Rails 5.1+, and is tested against all
major Rails releases up to 7.0.
major Rails releases up to 7.1.

Ruby versions older than 2.7 are no longer officially supported.

Expand Down
46 changes: 24 additions & 22 deletions gemfiles/rails_5.1.gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
PATH
remote: ..
specs:
meta-tags (2.18.0)
actionpack (>= 3.2.0, < 7.1)
meta-tags (2.19.0)
actionpack (>= 3.2.0, < 7.2)

GEM
remote: https://rubygems.org/
Expand Down Expand Up @@ -30,14 +30,15 @@ GEM
rake
thor (>= 0.14.0)
ast (2.4.2)
base64 (0.1.1)
builder (3.2.4)
concurrent-ruby (1.2.2)
crass (1.0.6)
csv (3.2.7)
diff-lcs (1.5.0)
docile (1.4.0)
erubi (1.12.0)
ffi (1.15.5)
ffi (1.16.3)
fileutils (1.7.1)
i18n (1.14.1)
concurrent-ruby (~> 1.0)
Expand All @@ -52,11 +53,11 @@ GEM
crass (~> 1.0.2)
nokogiri (>= 1.12.0)
method_source (1.0.0)
minitest (5.19.0)
nokogiri (1.15.3-arm64-darwin)
minitest (5.20.0)
nokogiri (1.15.4-arm64-darwin)
racc (~> 1.4)
parallel (1.23.0)
parser (3.2.2.3)
parser (3.2.2.4)
ast (~> 2.4.1)
racc
racc (1.7.1)
Expand All @@ -81,7 +82,7 @@ GEM
rb-fsevent (0.11.2)
rb-inotify (0.10.1)
ffi (~> 1.0)
rbs (3.1.3)
rbs (3.2.2)
regexp_parser (2.8.1)
rexml (3.2.6)
rspec (3.12.0)
Expand All @@ -102,23 +103,25 @@ GEM
rspec-support (3.12.1)
rspec_junit_formatter (0.6.0)
rspec-core (>= 2, < 4, != 2.12.0)
rubocop (1.52.1)
rubocop (1.56.4)
base64 (~> 0.1.1)
json (~> 2.3)
language_server-protocol (>= 3.17.0)
parallel (~> 1.10)
parser (>= 3.2.2.3)
rainbow (>= 2.2.2, < 4.0)
regexp_parser (>= 1.8, < 3.0)
rexml (>= 3.2.5, < 4.0)
rubocop-ast (>= 1.28.0, < 2.0)
rubocop-ast (>= 1.28.1, < 2.0)
ruby-progressbar (~> 1.7)
unicode-display_width (>= 2.4.0, < 3.0)
rubocop-ast (1.29.0)
parser (>= 3.2.1.0)
rubocop-capybara (2.18.0)
rubocop-capybara (2.19.0)
rubocop (~> 1.41)
rubocop-factory_bot (2.23.1)
rubocop-factory_bot (2.24.0)
rubocop (~> 1.33)
rubocop-performance (1.18.0)
rubocop-performance (1.19.1)
rubocop (>= 1.7.0, < 2.0)
rubocop-ast (>= 0.4.0)
rubocop-rails (2.20.2)
Expand All @@ -127,7 +130,7 @@ GEM
rubocop (>= 1.33.0, < 2.0)
rubocop-rake (0.6.0)
rubocop (~> 1.0)
rubocop-rspec (2.23.0)
rubocop-rspec (2.23.2)
rubocop (~> 1.33)
rubocop-capybara (~> 2.17)
rubocop-factory_bot (~> 2.22)
Expand All @@ -139,19 +142,19 @@ GEM
simplecov_json_formatter (~> 0.1)
simplecov-html (0.12.3)
simplecov_json_formatter (0.1.4)
standard (1.30.1)
standard (1.31.1)
language_server-protocol (~> 3.17.0.2)
lint_roller (~> 1.0)
rubocop (~> 1.52.0)
rubocop (~> 1.56.2)
standard-custom (~> 1.0.0)
standard-performance (~> 1.1.0)
standard-performance (~> 1.2)
standard-custom (1.0.2)
lint_roller (~> 1.0)
rubocop (~> 1.50)
standard-performance (1.1.2)
standard-performance (1.2.0)
lint_roller (~> 1.1)
rubocop-performance (~> 1.18.0)
steep (1.5.2)
rubocop-performance (~> 1.19.0)
steep (1.5.3)
activesupport (>= 5.1)
concurrent-ruby (>= 1.1.10)
csv (>= 3.0.9)
Expand All @@ -173,11 +176,10 @@ GEM
thread_safe (0.3.6)
tzinfo (1.2.11)
thread_safe (~> 0.1)
unicode-display_width (2.4.2)
unicode-display_width (2.5.0)

PLATFORMS
arm64-darwin-21
arm64-darwin-22
arm64-darwin

DEPENDENCIES
appraisal (~> 2.5.0)
Expand Down
Loading