From 053977f87595b10b690ad258b90bbd5389ba3b59 Mon Sep 17 00:00:00 2001 From: Hakeem Abdul-Razak <94065808+hakeem0114@users.noreply.github.com> Date: Wed, 7 May 2025 03:01:14 -0400 Subject: [PATCH 1/6] Add ruby 3.4 to CI --- .github/workflows/ruby.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/ruby.yml b/.github/workflows/ruby.yml index e940a81..d15e44d 100644 --- a/.github/workflows/ruby.yml +++ b/.github/workflows/ruby.yml @@ -25,6 +25,7 @@ jobs: - 3.2 - 3.3 - 3.4.0-preview1 + - 3.4 - head - jruby - jruby-head From 445aa22bfca6e39be5b678ecdcab5164a1de4e29 Mon Sep 17 00:00:00 2001 From: Hakeem Abdul-Razak <94065808+hakeem0114@users.noreply.github.com> Date: Thu, 8 May 2025 00:22:59 -0400 Subject: [PATCH 2/6] Address reviewer's comments --- .github/workflows/ruby.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ruby.yml b/.github/workflows/ruby.yml index d15e44d..d8a3787 100644 --- a/.github/workflows/ruby.yml +++ b/.github/workflows/ruby.yml @@ -24,8 +24,8 @@ jobs: - 3.1 - 3.2 - 3.3 - - 3.4.0-preview1 - 3.4 + - 3.5.0-preview1 - head - jruby - jruby-head @@ -45,6 +45,7 @@ jobs: - { os: windows, ruby: truffleruby } - { os: windows, ruby: truffleruby-head } - { os: windows, ruby: 3.4.0-preview1 } + - { os: windows, ruby: 3.5.0-preview1 } runs-on: ${{ matrix.os }}-latest From e34cdd00e8ecaa91f14f1fc6b0e299f40e54c328 Mon Sep 17 00:00:00 2001 From: "T.J. Schuck" Date: Thu, 8 May 2025 11:56:48 -0400 Subject: [PATCH 3/6] Cleanup --- .github/workflows/ruby.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/ruby.yml b/.github/workflows/ruby.yml index d8a3787..aa83792 100644 --- a/.github/workflows/ruby.yml +++ b/.github/workflows/ruby.yml @@ -44,7 +44,6 @@ jobs: - { os: macos, ruby: 2.5 } - { os: windows, ruby: truffleruby } - { os: windows, ruby: truffleruby-head } - - { os: windows, ruby: 3.4.0-preview1 } - { os: windows, ruby: 3.5.0-preview1 } runs-on: ${{ matrix.os }}-latest From 2cdfc2f0acc6a73891138ade3203a90d3625b225 Mon Sep 17 00:00:00 2001 From: "T.J. Schuck" Date: Thu, 8 May 2025 11:57:11 -0400 Subject: [PATCH 4/6] rdoc no longer included with Ruby 3.5+ --- bcrypt.gemspec | 1 + 1 file changed, 1 insertion(+) diff --git a/bcrypt.gemspec b/bcrypt.gemspec index c425529..5c1bf93 100644 --- a/bcrypt.gemspec +++ b/bcrypt.gemspec @@ -14,6 +14,7 @@ Gem::Specification.new do |s| s.add_development_dependency 'rake-compiler', '~> 1.2.0' s.add_development_dependency 'rspec', '>= 3' + s.add_development_dependency 'rdoc' s.rdoc_options += ['--title', 'bcrypt-ruby', '--line-numbers', '--inline-source', '--main', 'README.md'] s.extra_rdoc_files += ['README.md', 'COPYING', 'CHANGELOG', *Dir['lib/**/*.rb']] From c7a1fa876d20089abd56805669924c466874306b Mon Sep 17 00:00:00 2001 From: "T.J. Schuck" Date: Thu, 8 May 2025 11:58:27 -0400 Subject: [PATCH 5/6] benchmark no longer included with Ruby 3.5+ --- bcrypt.gemspec | 1 + 1 file changed, 1 insertion(+) diff --git a/bcrypt.gemspec b/bcrypt.gemspec index 5c1bf93..3328401 100644 --- a/bcrypt.gemspec +++ b/bcrypt.gemspec @@ -14,6 +14,7 @@ Gem::Specification.new do |s| s.add_development_dependency 'rake-compiler', '~> 1.2.0' s.add_development_dependency 'rspec', '>= 3' + s.add_development_dependency 'benchmark' s.add_development_dependency 'rdoc' s.rdoc_options += ['--title', 'bcrypt-ruby', '--line-numbers', '--inline-source', '--main', 'README.md'] From 401b0e830285b952c9ada68f80a1c81c2985bed1 Mon Sep 17 00:00:00 2001 From: Hakeem Abdul-Razak <94065808+hakeem0114@users.noreply.github.com> Date: Sat, 10 May 2025 22:21:31 -0400 Subject: [PATCH 6/6] Exclude unsupported versions --- .github/workflows/ruby.yml | 80 +++++++++++++++++++++----------------- 1 file changed, 45 insertions(+), 35 deletions(-) diff --git a/.github/workflows/ruby.yml b/.github/workflows/ruby.yml index aa83792..e210e42 100644 --- a/.github/workflows/ruby.yml +++ b/.github/workflows/ruby.yml @@ -13,38 +13,46 @@ jobs: - macos - windows ruby: - - 2.1 - - 2.2 - - 2.3 - - 2.4 - - 2.5 - - 2.6 - - 2.7 + - '2.1' + - '2.2' + - '2.3' + - '2.4' + - '2.5' + - '2.6' + - '2.7' - '3.0' - - 3.1 - - 3.2 - - 3.3 - - 3.4 - - 3.5.0-preview1 - - head - - jruby - - jruby-head - - truffleruby - - truffleruby-head - - mingw + - '3.1' + - '3.2' + - '3.3' + - '3.4' + - '3.5.0-preview1' + - 'head' + - 'jruby' + - 'jruby-head' + - 'truffleruby' + - 'truffleruby-head' + - 'mingw' exclude: - - { os: ubuntu, ruby: 2.1 } - - { os: ubuntu, ruby: 2.2 } - - { os: ubuntu, ruby: mingw } - - { os: macos, ruby: mingw } - - { os: macos, ruby: 2.1 } - - { os: macos, ruby: 2.2 } - - { os: macos, ruby: 2.3 } - - { os: macos, ruby: 2.4 } - - { os: macos, ruby: 2.5 } - - { os: windows, ruby: truffleruby } - - { os: windows, ruby: truffleruby-head } - - { os: windows, ruby: 3.5.0-preview1 } + - { os: ubuntu, ruby: '2.1' } + - { os: ubuntu, ruby: '2.2' } + - { os: ubuntu, ruby: '2.5' } + - { os: ubuntu, ruby: '2.6' } + - { os: ubuntu, ruby: 'mingw' } + - { os: macos, ruby: 'mingw' } + - { os: macos, ruby: '2.1' } + - { os: macos, ruby: '2.2' } + - { os: macos, ruby: '2.3' } + - { os: macos, ruby: '2.4' } + - { os: macos, ruby: '2.5' } + - { os: macos, ruby: '2.6' } + - { os: windows, ruby: 'truffleruby' } + - { os: windows, ruby: 'truffleruby-head' } + - { os: windows, ruby: '2.2' } + - { os: windows, ruby: '2.3' } + - { os: windows, ruby: '2.5' } + - { os: windows, ruby: '2.6' } + - { os: windows, ruby: 'head' } + - { os: windows, ruby: '3.5.0-preview1' } runs-on: ${{ matrix.os }}-latest @@ -70,11 +78,13 @@ jobs: - ubuntu-20.04 - macos-13 ruby: - - 2.1 - - 2.2 - - 2.3 - - 2.4 - - 2.5 + - '2.1' + - '2.2' + - '2.3' + - '2.4' + - '2.5' + exclude: + - { os: macos-13, ruby: '2.5' } runs-on: ${{ matrix.os }}