From c688095eaef8285f9831f3cfc0ca11de49d01977 Mon Sep 17 00:00:00 2001 From: KinWang-2013 <94952098+KinWang-2013@users.noreply.github.com> Date: Thu, 19 Sep 2024 18:43:58 +0600 Subject: [PATCH 01/14] add and remvoe rubies --- .github/workflows/ruby.yml | 4 +--- CHANGELOG.md | 1 + 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ruby.yml b/.github/workflows/ruby.yml index 652c5de..248fa05 100644 --- a/.github/workflows/ruby.yml +++ b/.github/workflows/ruby.yml @@ -9,13 +9,11 @@ jobs: fail-fast: false matrix: include: + - ruby-version: 3.2 - ruby-version: 3.1 - ruby-version: 3.0 - ruby-version: 2.5 - ruby-version: 2.6 - - ruby-version: 2.4 - bundler-version: 1.17.3 - gemfile: gemfiles/rails_4.gemfile - ruby-version: 2.6 gemfile: gemfiles/rails_5.0.gemfile - ruby-version: 2.6 diff --git a/CHANGELOG.md b/CHANGELOG.md index a0ea6d3..6cb242d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,7 @@ * [#131](https://github.com/radar/distance_of_time_in_words/pull/131): Deprecates `highest_measure_only`. Adds alternate form of `highest_measures` option to permit rounding up whatever part of the duration was previously silently discarded - [@seansfkelley](https://github.com/seansfkelley). * [#133](https://github.com/radar/distance_of_time_in_words/pull/133): Test on Ruby 3.0 and 3.1 - [@dblock](https://github.com/dblock). +* [#135](https://github.com/radar/distance_of_time_in_words/pull/135): Revmove ruby 2.4 and add ruby 2.5 - [@KinWang-2013](https://github.com/KinWang-2013) * Your contribution here. ## 5.3.3 (2022/04/25) From fdc3187179ee4761d1de18106541c57041d675aa Mon Sep 17 00:00:00 2001 From: KinWang-2013 <94952098+KinWang-2013@users.noreply.github.com> Date: Thu, 19 Sep 2024 18:45:47 +0600 Subject: [PATCH 02/14] fix typo --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6cb242d..5bb5d58 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,7 +2,7 @@ * [#131](https://github.com/radar/distance_of_time_in_words/pull/131): Deprecates `highest_measure_only`. Adds alternate form of `highest_measures` option to permit rounding up whatever part of the duration was previously silently discarded - [@seansfkelley](https://github.com/seansfkelley). * [#133](https://github.com/radar/distance_of_time_in_words/pull/133): Test on Ruby 3.0 and 3.1 - [@dblock](https://github.com/dblock). -* [#135](https://github.com/radar/distance_of_time_in_words/pull/135): Revmove ruby 2.4 and add ruby 2.5 - [@KinWang-2013](https://github.com/KinWang-2013) +* [#135](https://github.com/radar/distance_of_time_in_words/pull/135): Revmove ruby 2.4 and add ruby 3.2 - [@KinWang-2013](https://github.com/KinWang-2013) * Your contribution here. ## 5.3.3 (2022/04/25) From 0ef4eac65a061c1e2857f7464f314d006854d9f1 Mon Sep 17 00:00:00 2001 From: Kinley Wangchuk <94952098+KinWang-2013@users.noreply.github.com> Date: Fri, 20 Sep 2024 11:42:00 +0600 Subject: [PATCH 03/14] Update CHANGELOG.md MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Trung Lê <8@tle.id.au> --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5bb5d58..b345f30 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,7 +2,7 @@ * [#131](https://github.com/radar/distance_of_time_in_words/pull/131): Deprecates `highest_measure_only`. Adds alternate form of `highest_measures` option to permit rounding up whatever part of the duration was previously silently discarded - [@seansfkelley](https://github.com/seansfkelley). * [#133](https://github.com/radar/distance_of_time_in_words/pull/133): Test on Ruby 3.0 and 3.1 - [@dblock](https://github.com/dblock). -* [#135](https://github.com/radar/distance_of_time_in_words/pull/135): Revmove ruby 2.4 and add ruby 3.2 - [@KinWang-2013](https://github.com/KinWang-2013) +* [#135](https://github.com/radar/distance_of_time_in_words/pull/135): Remove ruby 2.4 and add ruby 3.2 - [@KinWang-2013](https://github.com/KinWang-2013) * Your contribution here. ## 5.3.3 (2022/04/25) From 93daaafe69c7dd37e74e8a0a2ede473e7c8246e1 Mon Sep 17 00:00:00 2001 From: Kinley Wangchuk <94952098+KinWang-2013@users.noreply.github.com> Date: Tue, 24 Sep 2024 11:16:22 +0600 Subject: [PATCH 04/14] Update CHANGELOG.md Co-authored-by: Daniel (dB.) Doubrovkine --- CHANGELOG.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b345f30..0a2f92f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,7 +2,8 @@ * [#131](https://github.com/radar/distance_of_time_in_words/pull/131): Deprecates `highest_measure_only`. Adds alternate form of `highest_measures` option to permit rounding up whatever part of the duration was previously silently discarded - [@seansfkelley](https://github.com/seansfkelley). * [#133](https://github.com/radar/distance_of_time_in_words/pull/133): Test on Ruby 3.0 and 3.1 - [@dblock](https://github.com/dblock). -* [#135](https://github.com/radar/distance_of_time_in_words/pull/135): Remove ruby 2.4 and add ruby 3.2 - [@KinWang-2013](https://github.com/KinWang-2013) +* [#135](https://github.com/radar/distance_of_time_in_words/pull/135): Add support for Ruby 3.2 - [@KinWang-2013](https://github.com/KinWang-2013). +* [#135](https://github.com/radar/distance_of_time_in_words/pull/135): Remove support for Ruby 2.4 and Rails 4 - [@KinWang-2013](https://github.com/KinWang-2013). * Your contribution here. ## 5.3.3 (2022/04/25) From c127ae2cd4dc36a0a29866c2285e8fab28f71fab Mon Sep 17 00:00:00 2001 From: KinWang-2013 <94952098+KinWang-2013@users.noreply.github.com> Date: Tue, 24 Sep 2024 11:17:33 +0600 Subject: [PATCH 05/14] remove unwanted versions and files --- .github/workflows/ruby.yml | 11 ----------- gemfiles/rails_4.gemfile | 9 --------- gemfiles/rails_5.0.gemfile | 9 --------- gemfiles/rails_5.1.gemfile | 9 --------- gemfiles/rails_5.2.gemfile | 9 --------- gemfiles/rails_6.0.gemfile | 9 --------- 6 files changed, 56 deletions(-) delete mode 100644 gemfiles/rails_4.gemfile delete mode 100644 gemfiles/rails_5.0.gemfile delete mode 100644 gemfiles/rails_5.1.gemfile delete mode 100644 gemfiles/rails_5.2.gemfile delete mode 100644 gemfiles/rails_6.0.gemfile diff --git a/.github/workflows/ruby.yml b/.github/workflows/ruby.yml index 248fa05..b0b7b0a 100644 --- a/.github/workflows/ruby.yml +++ b/.github/workflows/ruby.yml @@ -11,17 +11,6 @@ jobs: include: - ruby-version: 3.2 - ruby-version: 3.1 - - ruby-version: 3.0 - - ruby-version: 2.5 - - ruby-version: 2.6 - - ruby-version: 2.6 - gemfile: gemfiles/rails_5.0.gemfile - - ruby-version: 2.6 - gemfile: gemfiles/rails_5.1.gemfile - - ruby-version: 2.6 - gemfile: gemfiles/rails_5.2.gemfile - - ruby-version: 2.6 - gemfile: gemfiles/rails_6.0.gemfile steps: - uses: actions/checkout@v2 - name: Set up Ruby diff --git a/gemfiles/rails_4.gemfile b/gemfiles/rails_4.gemfile deleted file mode 100644 index 74a1d0e..0000000 --- a/gemfiles/rails_4.gemfile +++ /dev/null @@ -1,9 +0,0 @@ -# frozen_string_literal: true - -# This file was generated by Appraisal - -source 'http://rubygems.org' - -gem 'rails', '~> 4.0' - -gemspec path: '../' diff --git a/gemfiles/rails_5.0.gemfile b/gemfiles/rails_5.0.gemfile deleted file mode 100644 index af27ec6..0000000 --- a/gemfiles/rails_5.0.gemfile +++ /dev/null @@ -1,9 +0,0 @@ -# frozen_string_literal: true - -# This file was generated by Appraisal - -source 'http://rubygems.org' - -gem 'rails', '~> 5.0.0' - -gemspec path: '../' diff --git a/gemfiles/rails_5.1.gemfile b/gemfiles/rails_5.1.gemfile deleted file mode 100644 index 3575853..0000000 --- a/gemfiles/rails_5.1.gemfile +++ /dev/null @@ -1,9 +0,0 @@ -# frozen_string_literal: true - -# This file was generated by Appraisal - -source 'http://rubygems.org' - -gem 'rails', '~> 5.1.0' - -gemspec path: '../' diff --git a/gemfiles/rails_5.2.gemfile b/gemfiles/rails_5.2.gemfile deleted file mode 100644 index 5db4610..0000000 --- a/gemfiles/rails_5.2.gemfile +++ /dev/null @@ -1,9 +0,0 @@ -# frozen_string_literal: true - -# This file was generated by Appraisal - -source 'http://rubygems.org' - -gem 'rails', '~> 5.2.0' - -gemspec path: '../' diff --git a/gemfiles/rails_6.0.gemfile b/gemfiles/rails_6.0.gemfile deleted file mode 100644 index 21088de..0000000 --- a/gemfiles/rails_6.0.gemfile +++ /dev/null @@ -1,9 +0,0 @@ -# frozen_string_literal: true - -# This file was generated by Appraisal - -source 'http://rubygems.org' - -gem 'rails', '~> 6.0.0' - -gemspec path: '../' From 1610c8a94bb7b8d587f89220080ef1730c074798 Mon Sep 17 00:00:00 2001 From: KinWang-2013 <94952098+KinWang-2013@users.noreply.github.com> Date: Tue, 24 Sep 2024 11:24:20 +0600 Subject: [PATCH 06/14] update changelog --- CHANGELOG.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0a2f92f..ef0fda3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,9 @@ * [#133](https://github.com/radar/distance_of_time_in_words/pull/133): Test on Ruby 3.0 and 3.1 - [@dblock](https://github.com/dblock). * [#135](https://github.com/radar/distance_of_time_in_words/pull/135): Add support for Ruby 3.2 - [@KinWang-2013](https://github.com/KinWang-2013). * [#135](https://github.com/radar/distance_of_time_in_words/pull/135): Remove support for Ruby 2.4 and Rails 4 - [@KinWang-2013](https://github.com/KinWang-2013). +* [#135](https://github.com/radar/distance_of_time_in_words/pull/135): Remove support for Ruby 2.5 - [@KinWang-2013](https://github.com/KinWang-2013). +* [#135](https://github.com/radar/distance_of_time_in_words/pull/135): Remove support for Ruby 2.6 and Rails 5 and 6 - [@KinWang-2013](https://github.com/KinWang-2013). +* [#135](https://github.com/radar/distance_of_time_in_words/pull/135): Remove support for Ruby 3.0 - [@KinWang-2013](https://github.com/KinWang-2013). * Your contribution here. ## 5.3.3 (2022/04/25) From b5878862260e993995f95656f2072211bac62b35 Mon Sep 17 00:00:00 2001 From: KinWang-2013 <94952098+KinWang-2013@users.noreply.github.com> Date: Wed, 25 Sep 2024 18:23:31 +0600 Subject: [PATCH 07/14] re add gemfiles --- .github/workflows/ruby.yml | 12 ++++++++++++ gemfiles/rails_4.gemfile | 9 +++++++++ gemfiles/rails_5.0.gemfile | 9 +++++++++ gemfiles/rails_5.1.gemfile | 9 +++++++++ gemfiles/rails_5.2.gemfile | 9 +++++++++ gemfiles/rails_6.0.gemfile | 9 +++++++++ 6 files changed, 57 insertions(+) create mode 100644 gemfiles/rails_4.gemfile create mode 100644 gemfiles/rails_5.0.gemfile create mode 100644 gemfiles/rails_5.1.gemfile create mode 100644 gemfiles/rails_5.2.gemfile create mode 100644 gemfiles/rails_6.0.gemfile diff --git a/.github/workflows/ruby.yml b/.github/workflows/ruby.yml index b0b7b0a..4409af4 100644 --- a/.github/workflows/ruby.yml +++ b/.github/workflows/ruby.yml @@ -11,6 +11,18 @@ jobs: include: - ruby-version: 3.2 - ruby-version: 3.1 + - ruby-version: 3.0 + - ruby-version: 2.7 + - ruby-version: 3.2 + gemfile: gemfiles/rails_4.gemfile + - ruby-version: 3.2 + gemfile: gemfiles/rails_5.0.gemfile + - ruby-version: 3.2 + gemfile: gemfiles/rails_5.1.gemfile + - ruby-version: 3.2 + gemfile: gemfiles/rails_5.2.gemfile + - ruby-version: 3.2 + gemfile: gemfiles/rails_6.0.gemfile steps: - uses: actions/checkout@v2 - name: Set up Ruby diff --git a/gemfiles/rails_4.gemfile b/gemfiles/rails_4.gemfile new file mode 100644 index 0000000..74a1d0e --- /dev/null +++ b/gemfiles/rails_4.gemfile @@ -0,0 +1,9 @@ +# frozen_string_literal: true + +# This file was generated by Appraisal + +source 'http://rubygems.org' + +gem 'rails', '~> 4.0' + +gemspec path: '../' diff --git a/gemfiles/rails_5.0.gemfile b/gemfiles/rails_5.0.gemfile new file mode 100644 index 0000000..af27ec6 --- /dev/null +++ b/gemfiles/rails_5.0.gemfile @@ -0,0 +1,9 @@ +# frozen_string_literal: true + +# This file was generated by Appraisal + +source 'http://rubygems.org' + +gem 'rails', '~> 5.0.0' + +gemspec path: '../' diff --git a/gemfiles/rails_5.1.gemfile b/gemfiles/rails_5.1.gemfile new file mode 100644 index 0000000..3575853 --- /dev/null +++ b/gemfiles/rails_5.1.gemfile @@ -0,0 +1,9 @@ +# frozen_string_literal: true + +# This file was generated by Appraisal + +source 'http://rubygems.org' + +gem 'rails', '~> 5.1.0' + +gemspec path: '../' diff --git a/gemfiles/rails_5.2.gemfile b/gemfiles/rails_5.2.gemfile new file mode 100644 index 0000000..5db4610 --- /dev/null +++ b/gemfiles/rails_5.2.gemfile @@ -0,0 +1,9 @@ +# frozen_string_literal: true + +# This file was generated by Appraisal + +source 'http://rubygems.org' + +gem 'rails', '~> 5.2.0' + +gemspec path: '../' diff --git a/gemfiles/rails_6.0.gemfile b/gemfiles/rails_6.0.gemfile new file mode 100644 index 0000000..21088de --- /dev/null +++ b/gemfiles/rails_6.0.gemfile @@ -0,0 +1,9 @@ +# frozen_string_literal: true + +# This file was generated by Appraisal + +source 'http://rubygems.org' + +gem 'rails', '~> 6.0.0' + +gemspec path: '../' From 9c37dd21a09362ae1ccc3772295065ff789ca93f Mon Sep 17 00:00:00 2001 From: KinWang-2013 <94952098+KinWang-2013@users.noreply.github.com> Date: Wed, 25 Sep 2024 18:25:57 +0600 Subject: [PATCH 08/14] update changelog --- CHANGELOG.md | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ef0fda3..2baf6d7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,10 +3,9 @@ * [#131](https://github.com/radar/distance_of_time_in_words/pull/131): Deprecates `highest_measure_only`. Adds alternate form of `highest_measures` option to permit rounding up whatever part of the duration was previously silently discarded - [@seansfkelley](https://github.com/seansfkelley). * [#133](https://github.com/radar/distance_of_time_in_words/pull/133): Test on Ruby 3.0 and 3.1 - [@dblock](https://github.com/dblock). * [#135](https://github.com/radar/distance_of_time_in_words/pull/135): Add support for Ruby 3.2 - [@KinWang-2013](https://github.com/KinWang-2013). -* [#135](https://github.com/radar/distance_of_time_in_words/pull/135): Remove support for Ruby 2.4 and Rails 4 - [@KinWang-2013](https://github.com/KinWang-2013). -* [#135](https://github.com/radar/distance_of_time_in_words/pull/135): Remove support for Ruby 2.5 - [@KinWang-2013](https://github.com/KinWang-2013). -* [#135](https://github.com/radar/distance_of_time_in_words/pull/135): Remove support for Ruby 2.6 and Rails 5 and 6 - [@KinWang-2013](https://github.com/KinWang-2013). -* [#135](https://github.com/radar/distance_of_time_in_words/pull/135): Remove support for Ruby 3.0 - [@KinWang-2013](https://github.com/KinWang-2013). +* [#135](https://github.com/radar/distance_of_time_in_words/pull/135): Remove support for Ruby 2.4, 2.5 and 2.6 - [@KinWang-2013](https://github.com/KinWang-2013). +* [#135](https://github.com/radar/distance_of_time_in_words/pull/135): Add support for Ruby 2.7 - [@KinWang-2013](https://github.com/KinWang-2013). +* [#135](https://github.com/radar/distance_of_time_in_words/pull/135): Add test for Rails versions with Ruby 3.2 - [@KinWang-2013](https://github.com/KinWang-2013). * Your contribution here. ## 5.3.3 (2022/04/25) From 3772b1906d674dbee3f29f11a2adaba843bc9749 Mon Sep 17 00:00:00 2001 From: KinWang-2013 <94952098+KinWang-2013@users.noreply.github.com> Date: Wed, 25 Sep 2024 18:31:24 +0600 Subject: [PATCH 09/14] specify bundler version --- .github/workflows/ruby.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/ruby.yml b/.github/workflows/ruby.yml index 4409af4..362a2fa 100644 --- a/.github/workflows/ruby.yml +++ b/.github/workflows/ruby.yml @@ -14,8 +14,10 @@ jobs: - ruby-version: 3.0 - ruby-version: 2.7 - ruby-version: 3.2 + bundler-version: 2.0 gemfile: gemfiles/rails_4.gemfile - ruby-version: 3.2 + gemfile: gemfiles/rails_5.0.gemfile - ruby-version: 3.2 gemfile: gemfiles/rails_5.1.gemfile From 0808f4ac16597456d9d4725b0ac2e0ce7f949b21 Mon Sep 17 00:00:00 2001 From: KinWang-2013 <94952098+KinWang-2013@users.noreply.github.com> Date: Wed, 25 Sep 2024 18:34:28 +0600 Subject: [PATCH 10/14] fix bundler version --- .github/workflows/ruby.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/ruby.yml b/.github/workflows/ruby.yml index 362a2fa..37ff6aa 100644 --- a/.github/workflows/ruby.yml +++ b/.github/workflows/ruby.yml @@ -14,10 +14,9 @@ jobs: - ruby-version: 3.0 - ruby-version: 2.7 - ruby-version: 3.2 - bundler-version: 2.0 + bundler-version: 1.17.3 gemfile: gemfiles/rails_4.gemfile - ruby-version: 3.2 - gemfile: gemfiles/rails_5.0.gemfile - ruby-version: 3.2 gemfile: gemfiles/rails_5.1.gemfile From d0b1e3c2ed9ea2f4833416a555d32aa94e18842d Mon Sep 17 00:00:00 2001 From: KinWang-2013 <94952098+KinWang-2013@users.noreply.github.com> Date: Wed, 25 Sep 2024 18:55:41 +0600 Subject: [PATCH 11/14] update ruby version and changelog --- .github/workflows/ruby.yml | 11 +++++------ CHANGELOG.md | 2 +- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/.github/workflows/ruby.yml b/.github/workflows/ruby.yml index 37ff6aa..b6246ed 100644 --- a/.github/workflows/ruby.yml +++ b/.github/workflows/ruby.yml @@ -13,16 +13,15 @@ jobs: - ruby-version: 3.1 - ruby-version: 3.0 - ruby-version: 2.7 - - ruby-version: 3.2 - bundler-version: 1.17.3 + - ruby-version: 3.1 gemfile: gemfiles/rails_4.gemfile - - ruby-version: 3.2 + - ruby-version: 3.1 gemfile: gemfiles/rails_5.0.gemfile - - ruby-version: 3.2 + - ruby-version: 3.1 gemfile: gemfiles/rails_5.1.gemfile - - ruby-version: 3.2 + - ruby-version: 3.1 gemfile: gemfiles/rails_5.2.gemfile - - ruby-version: 3.2 + - ruby-version: 3.1 gemfile: gemfiles/rails_6.0.gemfile steps: - uses: actions/checkout@v2 diff --git a/CHANGELOG.md b/CHANGELOG.md index 2baf6d7..9e67577 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,7 +5,7 @@ * [#135](https://github.com/radar/distance_of_time_in_words/pull/135): Add support for Ruby 3.2 - [@KinWang-2013](https://github.com/KinWang-2013). * [#135](https://github.com/radar/distance_of_time_in_words/pull/135): Remove support for Ruby 2.4, 2.5 and 2.6 - [@KinWang-2013](https://github.com/KinWang-2013). * [#135](https://github.com/radar/distance_of_time_in_words/pull/135): Add support for Ruby 2.7 - [@KinWang-2013](https://github.com/KinWang-2013). -* [#135](https://github.com/radar/distance_of_time_in_words/pull/135): Add test for Rails versions with Ruby 3.2 - [@KinWang-2013](https://github.com/KinWang-2013). +* [#135](https://github.com/radar/distance_of_time_in_words/pull/135): Add test for Rails versions with Ruby 3.1 - [@KinWang-2013](https://github.com/KinWang-2013). * Your contribution here. ## 5.3.3 (2022/04/25) From 5b979935a4adaa0585fa65db71fe48c308a52f5e Mon Sep 17 00:00:00 2001 From: KinWang-2013 <94952098+KinWang-2013@users.noreply.github.com> Date: Wed, 25 Sep 2024 18:58:27 +0600 Subject: [PATCH 12/14] remove rails 4 --- .github/workflows/ruby.yml | 10 ++++------ CHANGELOG.md | 3 ++- gemfiles/rails_4.gemfile | 9 --------- 3 files changed, 6 insertions(+), 16 deletions(-) delete mode 100644 gemfiles/rails_4.gemfile diff --git a/.github/workflows/ruby.yml b/.github/workflows/ruby.yml index b6246ed..85ead89 100644 --- a/.github/workflows/ruby.yml +++ b/.github/workflows/ruby.yml @@ -13,15 +13,13 @@ jobs: - ruby-version: 3.1 - ruby-version: 3.0 - ruby-version: 2.7 - - ruby-version: 3.1 - gemfile: gemfiles/rails_4.gemfile - - ruby-version: 3.1 + - ruby-version: 3.2 gemfile: gemfiles/rails_5.0.gemfile - - ruby-version: 3.1 + - ruby-version: 3.2 gemfile: gemfiles/rails_5.1.gemfile - - ruby-version: 3.1 + - ruby-version: 3.2 gemfile: gemfiles/rails_5.2.gemfile - - ruby-version: 3.1 + - ruby-version: 3.2 gemfile: gemfiles/rails_6.0.gemfile steps: - uses: actions/checkout@v2 diff --git a/CHANGELOG.md b/CHANGELOG.md index 9e67577..1c8a913 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,7 +5,8 @@ * [#135](https://github.com/radar/distance_of_time_in_words/pull/135): Add support for Ruby 3.2 - [@KinWang-2013](https://github.com/KinWang-2013). * [#135](https://github.com/radar/distance_of_time_in_words/pull/135): Remove support for Ruby 2.4, 2.5 and 2.6 - [@KinWang-2013](https://github.com/KinWang-2013). * [#135](https://github.com/radar/distance_of_time_in_words/pull/135): Add support for Ruby 2.7 - [@KinWang-2013](https://github.com/KinWang-2013). -* [#135](https://github.com/radar/distance_of_time_in_words/pull/135): Add test for Rails versions with Ruby 3.1 - [@KinWang-2013](https://github.com/KinWang-2013). +* [#135](https://github.com/radar/distance_of_time_in_words/pull/135): Add test for Rails versions with Ruby 3.2 - [@KinWang-2013](https://github.com/KinWang-2013). +* [#135](https://github.com/radar/distance_of_time_in_words/pull/135): Remove suport for Rails 4 - [@KinWang-2013](https://github.com/KinWang-2013). * Your contribution here. ## 5.3.3 (2022/04/25) diff --git a/gemfiles/rails_4.gemfile b/gemfiles/rails_4.gemfile deleted file mode 100644 index 74a1d0e..0000000 --- a/gemfiles/rails_4.gemfile +++ /dev/null @@ -1,9 +0,0 @@ -# frozen_string_literal: true - -# This file was generated by Appraisal - -source 'http://rubygems.org' - -gem 'rails', '~> 4.0' - -gemspec path: '../' From 180b1820ede6475eeb7613f821f488f6760cee9a Mon Sep 17 00:00:00 2001 From: KinWang-2013 <94952098+KinWang-2013@users.noreply.github.com> Date: Thu, 26 Sep 2024 00:55:24 +0600 Subject: [PATCH 13/14] rails 5 test for ruby 2.7 --- .github/workflows/ruby.yml | 6 +++--- CHANGELOG.md | 5 +++-- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ruby.yml b/.github/workflows/ruby.yml index 85ead89..7351733 100644 --- a/.github/workflows/ruby.yml +++ b/.github/workflows/ruby.yml @@ -13,11 +13,11 @@ jobs: - ruby-version: 3.1 - ruby-version: 3.0 - ruby-version: 2.7 - - ruby-version: 3.2 + - ruby-version: 2.7 gemfile: gemfiles/rails_5.0.gemfile - - ruby-version: 3.2 + - ruby-version: 2.7 gemfile: gemfiles/rails_5.1.gemfile - - ruby-version: 3.2 + - ruby-version: 2.7 gemfile: gemfiles/rails_5.2.gemfile - ruby-version: 3.2 gemfile: gemfiles/rails_6.0.gemfile diff --git a/CHANGELOG.md b/CHANGELOG.md index 1c8a913..9f9183f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,8 +5,9 @@ * [#135](https://github.com/radar/distance_of_time_in_words/pull/135): Add support for Ruby 3.2 - [@KinWang-2013](https://github.com/KinWang-2013). * [#135](https://github.com/radar/distance_of_time_in_words/pull/135): Remove support for Ruby 2.4, 2.5 and 2.6 - [@KinWang-2013](https://github.com/KinWang-2013). * [#135](https://github.com/radar/distance_of_time_in_words/pull/135): Add support for Ruby 2.7 - [@KinWang-2013](https://github.com/KinWang-2013). -* [#135](https://github.com/radar/distance_of_time_in_words/pull/135): Add test for Rails versions with Ruby 3.2 - [@KinWang-2013](https://github.com/KinWang-2013). -* [#135](https://github.com/radar/distance_of_time_in_words/pull/135): Remove suport for Rails 4 - [@KinWang-2013](https://github.com/KinWang-2013). +* [#135](https://github.com/radar/distance_of_time_in_words/pull/135): Add test for Rails 6.0 with Ruby 3.2 - [@KinWang-2013](https://github.com/KinWang-2013). +* [#135](https://github.com/radar/distance_of_time_in_words/pull/135): Add test for Rails 5.X with Ruby 2.7 - [@KinWang-2013](https://github.com/KinWang-2013). +* [#135](https://github.com/radar/distance_of_time_in_words/pull/135): Remove support for Rails 4 - [@KinWang-2013](https://github.com/KinWang-2013). * Your contribution here. ## 5.3.3 (2022/04/25) From f1eac3b0655580ab74f7ada5915248ac1b334864 Mon Sep 17 00:00:00 2001 From: KinWang-2013 <94952098+KinWang-2013@users.noreply.github.com> Date: Thu, 26 Sep 2024 11:26:13 +0600 Subject: [PATCH 14/14] update changelog --- CHANGELOG.md | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9f9183f..c7fc28a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,12 +2,7 @@ * [#131](https://github.com/radar/distance_of_time_in_words/pull/131): Deprecates `highest_measure_only`. Adds alternate form of `highest_measures` option to permit rounding up whatever part of the duration was previously silently discarded - [@seansfkelley](https://github.com/seansfkelley). * [#133](https://github.com/radar/distance_of_time_in_words/pull/133): Test on Ruby 3.0 and 3.1 - [@dblock](https://github.com/dblock). -* [#135](https://github.com/radar/distance_of_time_in_words/pull/135): Add support for Ruby 3.2 - [@KinWang-2013](https://github.com/KinWang-2013). -* [#135](https://github.com/radar/distance_of_time_in_words/pull/135): Remove support for Ruby 2.4, 2.5 and 2.6 - [@KinWang-2013](https://github.com/KinWang-2013). -* [#135](https://github.com/radar/distance_of_time_in_words/pull/135): Add support for Ruby 2.7 - [@KinWang-2013](https://github.com/KinWang-2013). -* [#135](https://github.com/radar/distance_of_time_in_words/pull/135): Add test for Rails 6.0 with Ruby 3.2 - [@KinWang-2013](https://github.com/KinWang-2013). -* [#135](https://github.com/radar/distance_of_time_in_words/pull/135): Add test for Rails 5.X with Ruby 2.7 - [@KinWang-2013](https://github.com/KinWang-2013). -* [#135](https://github.com/radar/distance_of_time_in_words/pull/135): Remove support for Rails 4 - [@KinWang-2013](https://github.com/KinWang-2013). +* [#135](https://github.com/radar/distance_of_time_in_words/pull/135): Add support for Ruby 2.7 and 3.2, removed support for ruby 2.4, 2.5, 2.6 and Rails 4 - [@KinWang-2013](https://github.com/KinWang-2013). * Your contribution here. ## 5.3.3 (2022/04/25)