From 088ba41c25fd6c290b33bd1de75055a74d846ac2 Mon Sep 17 00:00:00 2001 From: Luke Hill Date: Thu, 7 Sep 2023 17:38:01 +0100 Subject: [PATCH 01/14] minimum ruby version is now 2.5 --- ruby/Gemfile | 1 + ruby/cucumber-gherkin.gemspec | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/ruby/Gemfile b/ruby/Gemfile index aadb3470e..be173b205 100644 --- a/ruby/Gemfile +++ b/ruby/Gemfile @@ -1,4 +1,5 @@ # frozen_string_literal: true + source "https://rubygems.org" gemspec diff --git a/ruby/cucumber-gherkin.gemspec b/ruby/cucumber-gherkin.gemspec index 12aedebc1..7ed1b903f 100644 --- a/ruby/cucumber-gherkin.gemspec +++ b/ruby/cucumber-gherkin.gemspec @@ -10,7 +10,7 @@ Gem::Specification.new do |s| s.homepage = 'https://github.com/cucumber/gherkin' s.platform = Gem::Platform::RUBY s.license = 'MIT' - s.required_ruby_version = '>= 2.3' + s.required_ruby_version = '>= 2.5' s.metadata = { 'bug_tracker_uri' => 'https://github.com/cucumber/gherkin/issues', From c3d8f021eea81efa7c78e2bf207e8c67e96fe134 Mon Sep 17 00:00:00 2001 From: Luke Hill Date: Thu, 7 Sep 2023 17:39:16 +0100 Subject: [PATCH 02/14] Bump minimum version of messages --- ruby/cucumber-gherkin.gemspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ruby/cucumber-gherkin.gemspec b/ruby/cucumber-gherkin.gemspec index 7ed1b903f..eff9bc0d1 100644 --- a/ruby/cucumber-gherkin.gemspec +++ b/ruby/cucumber-gherkin.gemspec @@ -20,7 +20,7 @@ Gem::Specification.new do |s| 'source_code_uri' => 'https://github.com/cucumber/gherkin/blob/main/ruby' } - s.add_runtime_dependency 'cucumber-messages', '>= 19.1.4', '< 22.1' + s.add_runtime_dependency 'cucumber-messages', '>= 21', '< 23' s.add_development_dependency 'rake', '~> 13.0', '>= 13.0.6' s.add_development_dependency 'rspec', '~> 3.11', '>= 3.11.0' From 71890120a52ae0e64670be22091a6ec4b1b5d6a7 Mon Sep 17 00:00:00 2001 From: Luke Hill Date: Thu, 7 Sep 2023 17:41:22 +0100 Subject: [PATCH 03/14] Update test ruby workflow --- .github/workflows/test-ruby.yml | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/.github/workflows/test-ruby.yml b/.github/workflows/test-ruby.yml index 53a0e87c3..c328ca7df 100644 --- a/.github/workflows/test-ruby.yml +++ b/.github/workflows/test-ruby.yml @@ -18,16 +18,14 @@ jobs: matrix: os: - ubuntu-latest - ruby: ["2.6", "2.7", "3.0", "3.1"] + ruby: ['2.6', '2.7', '3.0', '3.1', '3.2'] include: - os: macos-latest - ruby: "3.1" + ruby: '3.2' steps: - uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4 - - - name: Set up Ruby - uses: ruby/setup-ruby@v1 + - uses: ruby/setup-ruby@v1 with: ruby-version: ${{ matrix.ruby }} bundler-cache: true @@ -36,6 +34,5 @@ jobs: - run: bundle exec rake working-directory: ruby - - name: run acceptance tests - run: make acceptance - working-directory: ruby \ No newline at end of file + - run: make acceptance + working-directory: ruby From 8e48bbc8bf4a7d8280a9a4d741c162596a8a07df Mon Sep 17 00:00:00 2001 From: Luke Hill Date: Thu, 7 Sep 2023 17:41:49 +0100 Subject: [PATCH 04/14] Release using ruby 3.2 --- .github/workflows/release-rubygem.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release-rubygem.yml b/.github/workflows/release-rubygem.yml index 08c22acc0..010ac5ab2 100644 --- a/.github/workflows/release-rubygem.yml +++ b/.github/workflows/release-rubygem.yml @@ -13,7 +13,7 @@ jobs: - uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4 - uses: ruby/setup-ruby@v1 with: - ruby-version: '3.0.2' + ruby-version: '3.2' bundler-cache: true - uses: cucumber/action-publish-rubygem@v1.0.0 with: From 662a09c57b161f92f55dad618a7add2b8e42f58c Mon Sep 17 00:00:00 2001 From: Luke Hill Date: Thu, 7 Sep 2023 17:43:12 +0100 Subject: [PATCH 05/14] Update messages to use v22 --- CHANGELOG.md | 2 +- ruby/cucumber-gherkin.gemspec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4d3a4321d..081148e21 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,7 +8,7 @@ This document is formatted according to the principles of [Keep A CHANGELOG](htt ## [Unreleased] ### Changed -- [Go] Upgraded messages to v22 +- [Go, Ruby] Upgraded messages to v22 - [Go] Improve performance - don't compile regex on matcher create - [Perl] Fix release packaging - [Perl] Include CHANGELOG.md in tarball diff --git a/ruby/cucumber-gherkin.gemspec b/ruby/cucumber-gherkin.gemspec index eff9bc0d1..eb293d321 100644 --- a/ruby/cucumber-gherkin.gemspec +++ b/ruby/cucumber-gherkin.gemspec @@ -20,7 +20,7 @@ Gem::Specification.new do |s| 'source_code_uri' => 'https://github.com/cucumber/gherkin/blob/main/ruby' } - s.add_runtime_dependency 'cucumber-messages', '>= 21', '< 23' + s.add_runtime_dependency 'cucumber-messages', '~> 22.0' s.add_development_dependency 'rake', '~> 13.0', '>= 13.0.6' s.add_development_dependency 'rspec', '~> 3.11', '>= 3.11.0' From fa33a6fad215094e33f073634ffc9d933913cbe2 Mon Sep 17 00:00:00 2001 From: Luke Hill Date: Thu, 7 Sep 2023 17:44:13 +0100 Subject: [PATCH 06/14] Add changelog note about minimum ruby bump --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 081148e21..899a48255 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -16,6 +16,7 @@ This document is formatted according to the principles of [Keep A CHANGELOG](htt - [Perl] Harmonized error reporting with mainstream implementations; errors are now converted to messages and reported in the message stream ([#31](https://github.com/cucumber/gherkin/issues/31)) +- [Ruby] Update minimum ruby requirement from 2.3 to 2.5 ### Added - (i18n) Add Malayalam localization From 06cdb3064205fcd45c28688e64e05f014671239b Mon Sep 17 00:00:00 2001 From: Luke Hill Date: Thu, 7 Sep 2023 17:46:44 +0100 Subject: [PATCH 07/14] [noci]: Simplify changelog --- CHANGELOG.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 899a48255..e45912b76 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,11 +8,10 @@ This document is formatted according to the principles of [Keep A CHANGELOG](htt ## [Unreleased] ### Changed -- [Go, Ruby] Upgraded messages to v22 +- [Go, Ruby, Perl] Upgraded messages to v22 - [Go] Improve performance - don't compile regex on matcher create - [Perl] Fix release packaging - [Perl] Include CHANGELOG.md in tarball -- [Perl] Upgrade messages to v22 - [Perl] Harmonized error reporting with mainstream implementations; errors are now converted to messages and reported in the message stream ([#31](https://github.com/cucumber/gherkin/issues/31)) From 2b0d261b84b132dcc0ef1862e70cada2a268b4a5 Mon Sep 17 00:00:00 2001 From: Luke Hill Date: Fri, 8 Sep 2023 14:03:43 +0100 Subject: [PATCH 08/14] Relax messages requirement --- ruby/cucumber-gherkin.gemspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ruby/cucumber-gherkin.gemspec b/ruby/cucumber-gherkin.gemspec index eb293d321..eab7da58b 100644 --- a/ruby/cucumber-gherkin.gemspec +++ b/ruby/cucumber-gherkin.gemspec @@ -20,7 +20,7 @@ Gem::Specification.new do |s| 'source_code_uri' => 'https://github.com/cucumber/gherkin/blob/main/ruby' } - s.add_runtime_dependency 'cucumber-messages', '~> 22.0' + s.add_runtime_dependency 'cucumber-messages', '>= 19.1.4', '< 23' s.add_development_dependency 'rake', '~> 13.0', '>= 13.0.6' s.add_development_dependency 'rspec', '~> 3.11', '>= 3.11.0' From 6f03781e3438a784ff78d1d4a2a653e0933f6aa0 Mon Sep 17 00:00:00 2001 From: Luke Hill Date: Fri, 8 Sep 2023 14:23:47 +0100 Subject: [PATCH 09/14] Fix workflow bug where ruby tests weren't running correctly --- .github/workflows/test-ruby.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test-ruby.yml b/.github/workflows/test-ruby.yml index cd5b9572a..91d9253b9 100644 --- a/.github/workflows/test-ruby.yml +++ b/.github/workflows/test-ruby.yml @@ -12,7 +12,7 @@ on: branches: - main paths: - - c/** + - ruby/** - testdata/** workflow_call: From 718e60a5b9a7352069fb35880a6e77f196c01d46 Mon Sep 17 00:00:00 2001 From: "M.P. Korstanje" Date: Sat, 9 Sep 2023 11:26:31 +0200 Subject: [PATCH 10/14] Minimize diff --- CHANGELOG.md | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b59fe1388..3f4be2a50 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,9 +13,7 @@ This document is formatted according to the principles of [Keep A CHANGELOG](htt - [Go] Improve performance - don't compile regex on matcher create - [Perl] Fix release packaging - [Perl] Include CHANGELOG.md in tarball -- [Perl] Harmonized error reporting with mainstream implementations; - errors are now converted to messages and reported in the message stream - ([#31](https://github.com/cucumber/gherkin/issues/31)) +- [Perl] Harmonized error reporting with mainstream implementations; errors are now converted to messages and reported in the message stream ([#31](https://github.com/cucumber/gherkin/issues/31)) - [Ruby] Update minimum ruby requirement from 2.3 to 2.5 ### Added From 326ad1703e4d2620d8cdbd2fe10b426bd2cb46f5 Mon Sep 17 00:00:00 2001 From: "M.P. Korstanje" Date: Sat, 9 Sep 2023 11:28:40 +0200 Subject: [PATCH 11/14] Minimize diff --- CHANGELOG.md | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3f4be2a50..c339582b2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,12 +8,14 @@ This document is formatted according to the principles of [Keep A CHANGELOG](htt ## [Unreleased] ### Changed -- [Go, Ruby, Perl] Upgraded messages to v22 -- [.NET] Bump sdk to .net 8. Added .net 8 to test platforms +### Changed +- [.NET] Bump sdk to .net 8. Added .net 8 to test platforms. +- [Go] Upgraded messages to v22 - [Go] Improve performance - don't compile regex on matcher create - [Perl] Fix release packaging - [Perl] Include CHANGELOG.md in tarball -- [Perl] Harmonized error reporting with mainstream implementations; errors are now converted to messages and reported in the message stream ([#31](https://github.com/cucumber/gherkin/issues/31)) +- [Perl] Upgrade messages to v22 +- [Perl] Harmonized error reporting with mainstream implementations errors are now converted to messages and reported in the message stream ([#31](https://github.com/cucumber/gherkin/issues/31)) - [Ruby] Update minimum ruby requirement from 2.3 to 2.5 ### Added From c17bc9191770198c757e0bef31bb166d5ca09890 Mon Sep 17 00:00:00 2001 From: "M.P. Korstanje" Date: Sat, 9 Sep 2023 11:28:54 +0200 Subject: [PATCH 12/14] Minimize diff --- CHANGELOG.md | 1 - 1 file changed, 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c339582b2..2efdb4063 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,7 +8,6 @@ This document is formatted according to the principles of [Keep A CHANGELOG](htt ## [Unreleased] ### Changed -### Changed - [.NET] Bump sdk to .net 8. Added .net 8 to test platforms. - [Go] Upgraded messages to v22 - [Go] Improve performance - don't compile regex on matcher create From 99f5f60d93ae272129fc3c6f5092bfedaaf8aef0 Mon Sep 17 00:00:00 2001 From: "M.P. Korstanje" Date: Sat, 9 Sep 2023 11:29:28 +0200 Subject: [PATCH 13/14] Minimize diff --- ruby/Gemfile | 1 - 1 file changed, 1 deletion(-) diff --git a/ruby/Gemfile b/ruby/Gemfile index be173b205..aadb3470e 100644 --- a/ruby/Gemfile +++ b/ruby/Gemfile @@ -1,5 +1,4 @@ # frozen_string_literal: true - source "https://rubygems.org" gemspec From 65e36f1fb7af55155be461251d7de6cff8dbce51 Mon Sep 17 00:00:00 2001 From: Luke Hill Date: Tue, 12 Sep 2023 11:10:39 +0100 Subject: [PATCH 14/14] Fix missing changelog entry --- CHANGELOG.md | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2efdb4063..59cba7c44 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,13 +8,12 @@ This document is formatted according to the principles of [Keep A CHANGELOG](htt ## [Unreleased] ### Changed -- [.NET] Bump sdk to .net 8. Added .net 8 to test platforms. -- [Go] Upgraded messages to v22 +- [.NET] Bump sdk to .net 8. Added .net 8 to test platforms +- [Go, Perl, Ruby] Upgraded messages to v22 - [Go] Improve performance - don't compile regex on matcher create - [Perl] Fix release packaging - [Perl] Include CHANGELOG.md in tarball -- [Perl] Upgrade messages to v22 -- [Perl] Harmonized error reporting with mainstream implementations errors are now converted to messages and reported in the message stream ([#31](https://github.com/cucumber/gherkin/issues/31)) +- [Perl] Harmonized error reporting with mainstream implementations - errors are now converted to messages and reported in the message stream ([#31](https://github.com/cucumber/gherkin/issues/31)) - [Ruby] Update minimum ruby requirement from 2.3 to 2.5 ### Added