From 985e6d0579eba5cb534ac388179916fdab5adb9b Mon Sep 17 00:00:00 2001 From: m-nakamura145 Date: Tue, 21 May 2024 22:48:40 +0900 Subject: [PATCH 1/4] Support ruby 3.3 and 3.4.0-preview1 --- .github/workflows/ruby.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/ruby.yml b/.github/workflows/ruby.yml index 82c49b3..a93f979 100644 --- a/.github/workflows/ruby.yml +++ b/.github/workflows/ruby.yml @@ -23,6 +23,8 @@ jobs: - '3.0' - 3.1 - 3.2 + - 3.3 + - 3.4.0-preview1 - head - jruby - jruby-head From 9a3a85ca9de4557b22aa8836bc7c1b9c387c024b Mon Sep 17 00:00:00 2001 From: "T.J. Schuck" Date: Tue, 21 May 2024 09:58:48 -0400 Subject: [PATCH 2/4] Update README to remove specific Ruby version mentions So we don't have to update this in lockstep with the CI matrix --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index dd55971..88598ad 100644 --- a/README.md +++ b/README.md @@ -30,8 +30,8 @@ re-hash those passwords. This vulnerability only affected the JRuby gem. The bcrypt gem is available on the following Ruby platforms: * JRuby -* RubyInstaller 2.0 – 3.0 builds on Windows with the DevKit -* Any 2.0 – 3.0 Ruby on a BSD/OS X/Linux system with a compiler +* RubyInstaller builds on Windows with the DevKit +* Any modern Ruby on a BSD/OS X/Linux system with a compiler ## How to use `bcrypt()` in your Rails application From a75cc698c4733a79c213c8a9609563abedc450bc Mon Sep 17 00:00:00 2001 From: "T.J. Schuck" Date: Wed, 22 May 2024 17:08:30 -0400 Subject: [PATCH 3/4] Ruby 3.4.0.-preview1 is not available on Windows See https://github.com/ruby/setup-ruby and https://github.com/ruby/setup-ruby/blob/master/windows-versions.json --- .github/workflows/ruby.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/ruby.yml b/.github/workflows/ruby.yml index a93f979..9111c87 100644 --- a/.github/workflows/ruby.yml +++ b/.github/workflows/ruby.yml @@ -38,6 +38,7 @@ jobs: - { os: macos, ruby: mingw } - { os: windows, ruby: truffleruby } - { os: windows, ruby: truffleruby-head } + - { os: windows, ruby: 3.4.0-preview1 } runs-on: ${{ matrix.os }}-latest From b8a167ab23959d1f37983b9228e9f01c03c726fd Mon Sep 17 00:00:00 2001 From: "T.J. Schuck" Date: Wed, 22 May 2024 17:18:47 -0400 Subject: [PATCH 4/4] Test old Rubies on older x64 macOS --- .github/workflows/ruby.yml | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ruby.yml b/.github/workflows/ruby.yml index 9111c87..e940a81 100644 --- a/.github/workflows/ruby.yml +++ b/.github/workflows/ruby.yml @@ -36,6 +36,11 @@ jobs: - { 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.4.0-preview1 } @@ -60,11 +65,17 @@ jobs: strategy: fail-fast: false matrix: + os: + - ubuntu-20.04 + - macos-13 ruby: - 2.1 - 2.2 + - 2.3 + - 2.4 + - 2.5 - runs-on: ubuntu-20.04 + runs-on: ${{ matrix.os }} steps: - uses: actions/checkout@v2