feat: support Ruby 3.3.7

tamatebako · Jan 29, 2025 · 6f1883c · 6f1883c
1 parent 2022630
commit 6f1883c
Show file tree

Hide file tree

Showing 12 changed files with 97 additions and 22 deletions.
diff --git a/.cirrus.yml b/.cirrus.yml
@@ -28,7 +28,7 @@ test_task_template: &TEST_TASK_TEMPLATE
     RUBY_VER=3.2.6 tests/scripts/functional-tests.sh
 
   testset-1-app_script: |
-    RUBY_VER=3.3.6 MODE=app tests/scripts/functional-tests.sh
+    RUBY_VER=3.3.7 MODE=app tests/scripts/functional-tests.sh
 
   testset-2_script: |
     RUBY_VER=3.2.6 ruby tests-2/tebako-test.rb

diff --git a/.github/workflows/alpine.yml b/.github/workflows/alpine.yml
@@ -60,7 +60,7 @@ concurrency:
   cancel-in-progress: true
 
 env:
-  CACHE_VER: 16
+  CACHE_VER: 17
   TZ: "Etc/UTC"
   VERBOSE: no
 
@@ -121,7 +121,7 @@ jobs:
         env:
           - { CC: gcc,   CXX: g++,     ALPINE_VER: "3.17" }
           - { CC: clang, CXX: clang++, ALPINE_VER: "3.17" }
-        package_ruby_ver: [ '3.2.6', '3.3.6', '3.4.1' ]
+        package_ruby_ver: [ '3.2.6', '3.3.7', '3.4.1' ]
     env: ${{ matrix.env }}
     steps:
       - name: Install packages
@@ -178,7 +178,7 @@ jobs:
         env:
           - { CC: gcc,   CXX: g++,     ALPINE_VER: "3.17" }
           - { CC: clang, CXX: clang++, ALPINE_VER: "3.17" }
-        package_ruby_ver: [ '3.2.6', '3.3.6', '3.4.1' ]
+        package_ruby_ver: [ '3.2.6', '3.3.7', '3.4.1' ]
     env: ${{ matrix.env }}
     steps:
       - name: Install packages
@@ -234,7 +234,7 @@ jobs:
         env:
           - { CC: gcc,   CXX: g++,     ALPINE_VER: "3.17" }
           - { CC: clang, CXX: clang++, ALPINE_VER: "3.17" }
-        package_ruby_ver: [ '3.2.6', '3.3.6', '3.4.1']
+        package_ruby_ver: [ '3.2.6', '3.3.7', '3.4.1']
     env: ${{ matrix.env }}
     steps:
       - name: Install packages

diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
@@ -58,7 +58,7 @@ concurrency:
   cancel-in-progress: true
 
 env:
-  CACHE_VER: 16
+  CACHE_VER: 17
   VERBOSE: no
 
 jobs:
@@ -114,7 +114,7 @@ jobs:
           - { os: macos-14, xcode: 15.4 }
           - { os: macos-15, xcode: 16.1 }
 
-        package_ruby_ver: [ '3.2.6', '3.3.6', '3.4.1' ]
+        package_ruby_ver: [ '3.2.6', '3.3.7', '3.4.1' ]
         ruby_ver: ['3.2.6']
     steps:
       - name: Checkout tebako packaging environment
@@ -167,7 +167,7 @@ jobs:
           - { os: macos-14, xcode: 15.4 }
           - { os: macos-15, xcode: 16.1 }
 
-        package_ruby_ver: [ '3.3.6', '3.4.1' ]
+        package_ruby_ver: [ '3.3.7', '3.4.1' ]
         ruby_ver: ['3.2.6']
     steps:
       - name: Checkout tebako packaging environment
@@ -218,7 +218,7 @@ jobs:
           - { os: macos-14, xcode: 15.0.1, LG_VADDR: 39}
           - { os: macos-14, xcode: 15.4 }
           - { os: macos-15, xcode: 16.1 }
-        package_ruby_ver: [ '3.2.6', '3.3.6', '3.4.1' ]
+        package_ruby_ver: [ '3.2.6', '3.3.7', '3.4.1' ]
         ruby_ver: ['3.2.6']
     steps:
       - name: Checkout tebako packaging environment

diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml
@@ -60,7 +60,7 @@ concurrency:
   cancel-in-progress: true
 
 env:
-  CACHE_VER: 16
+  CACHE_VER: 17
   DEBIAN_FRONTEND: "noninteractive"
   TZ: "Etc/UTC"
 # show cmake output (yes/no)
@@ -112,7 +112,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        package_ruby_ver: [ '2.7.8', '3.0.7', '3.1.6', '3.2.4', '3.2.5', '3.2.6', '3.3.3', '3.3.4', '3.3.5', '3.3.6', '3.4.1' ]
+        package_ruby_ver: [ '2.7.8', '3.0.7', '3.1.6', '3.2.4', '3.2.5', '3.2.6', '3.3.3', '3.3.4', '3.3.5', '3.3.6', '3.3.7', '3.4.1' ]
         env:
           - { os: ubuntu-20.04, CC: gcc-10,   CXX: g++-10 }
           - { os: ubuntu-20.04, CC: clang-12, CXX: clang++-12 }
@@ -162,7 +162,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        package_ruby_ver: [ '2.7.8', '3.0.7', '3.1.6', '3.2.4', '3.2.5', '3.2.6', '3.3.3', '3.3.4', '3.3.5', '3.3.6', '3.4.1' ]
+        package_ruby_ver: [ '2.7.8', '3.0.7', '3.1.6', '3.2.4', '3.2.5', '3.2.6', '3.3.3', '3.3.4', '3.3.5', '3.3.6', '3.3.7', '3.4.1' ]
         env:
           - { os: ubuntu-20.04, CC: gcc-10,   CXX: g++-10 }
           - { os: ubuntu-20.04, CC: clang-12, CXX: clang++-12 }
@@ -211,7 +211,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        package_ruby_ver: [ '2.7.8', '3.0.7', '3.1.6', '3.2.4', '3.2.5', '3.2.6', '3.3.3', '3.3.4', '3.3.5', '3.3.6', '3.4.1' ]
+        package_ruby_ver: [ '2.7.8', '3.0.7', '3.1.6', '3.2.4', '3.2.5', '3.2.6', '3.3.3', '3.3.4', '3.3.5', '3.3.6', '3.3.7', '3.4.1' ]
         env:
           - { os: ubuntu-20.04, CC: gcc-10,   CXX: g++-10 }
           - { os: ubuntu-20.04, CC: clang-12, CXX: clang++-12 }

diff --git a/.github/workflows/windows-msys.yml b/.github/workflows/windows-msys.yml
@@ -60,7 +60,7 @@ concurrency:
   cancel-in-progress: true
 
 env:
-  CACHE_VER: 16
+  CACHE_VER: 17
   VERBOSE: no
 
 jobs:
@@ -149,7 +149,7 @@ jobs:
           - sys: ucrt64
             CC: gcc
             CXX: g++
-        package_ruby_ver: [  '3.2.6', '3.3.6', '3.4.1' ]
+        package_ruby_ver: [  '3.2.6', '3.3.6', '3.3.7', '3.4.1' ]
         script: ['bundle', 'app']
     env: ${{ matrix.env }}
 
@@ -232,7 +232,7 @@ jobs:
           - sys: ucrt64
             CC: gcc
             CXX: g++
-        package_ruby_ver: [ '3.2.6', '3.3.6', '3.4.1' ]
+        package_ruby_ver: [ '3.2.6', '3.3.6', '3.3.7', '3.4.1' ]
     env: ${{ matrix.env }}
 
     defaults:

diff --git a/Brewfile b/Brewfile
@@ -21,3 +21,4 @@ brew "fmt"
 brew "glog"
 brew "gnu-sed"
 brew "bash"
+brew "brotli"
diff --git a/README.adoc b/README.adoc
@@ -105,7 +105,7 @@ higher.
 | 3.0.7 | Linux, macOS
 | 3.1.6 | Linux, macOS, Windows
 | 3.2.{4,5,6} | Linux, macOS, Windows
-| 3.3.{3,4,5,6} | Linux, macOS, Windows
+| 3.3.{3,4,5,6,7} | Linux, macOS, Windows
 | 3.4.1 | Linux, macOS, Windows
 
 |===

diff --git a/lib/tebako/packager/pass1_patch.rb b/lib/tebako/packager/pass1_patch.rb
@@ -233,7 +233,7 @@ class Pass1MSysPatch < Pass1Patch
 
       WIN32_WINMAIN_C_PATCH = {
         "WinMain(HINSTANCE current, HINSTANCE prev, LPSTR cmdline, int showcmd)" =>
-          "wWinMain(HINSTANCE current, HINSTANCE prev, LPWSTR cmdline, int showcmd)"
+          "wWinMain(HINSTANCE current, HINSTANCE prev, LPWSTR cmdline, int showcmd) /* tebako patched */"
       }.freeze
 
       def patch_map
@@ -288,7 +288,7 @@ def msys_base_patches
       def msys_patches
         pm = msys_base_patches
 
-        if @ruby_ver.ruby34?
+        if @ruby_ver.ruby337?
           # ....................................................
           # RUBY_EXTERN shall be extern for static build but is set to __declspec(dllimport) for encodin libarary
           pm.store("include/ruby/onigmo.h", INCLUDE_RUBY_ONIGMO_H_PATCH)

diff --git a/lib/tebako/ruby_version.rb b/lib/tebako/ruby_version.rb
@@ -43,6 +43,7 @@ class RubyVersion
       "3.3.4" => "fe6a30f97d54e029768f2ddf4923699c416cdbc3a6e96db3e2d5716c7db96a34",
       "3.3.5" => "3781a3504222c2f26cb4b9eb9c1a12dbf4944d366ce24a9ff8cf99ecbce75196",
       "3.3.6" => "8dc48fffaf270f86f1019053f28e51e4da4cce32a36760a0603a9aee67d7fd8d",
+      "3.3.7" => "9c37c3b12288c7aec20ca121ce76845be5bb5d77662a24919651aaf1d12c8628",
       "3.4.1" => "3d385e5d22d368b064c817a13ed8e3cc3f71a7705d7ed1bae78013c33aa7c87f"
     }.freeze
 
@@ -89,6 +90,10 @@ def ruby33?
       @ruby33 ||= ruby3x? && @ruby_version[2].to_i >= 3
     end
 
+    def ruby337?
+      @ruby337 ||= ruby34? || (ruby33? && @ruby_version[2] == "3" && @ruby_version[4].to_i >= 7)
+    end
+
     def ruby34?
       @ruby34 ||= ruby3x? && @ruby_version[2].to_i >= 4
     end

diff --git a/lib/tebako/version.rb b/lib/tebako/version.rb
@@ -26,5 +26,5 @@
 # POSSIBILITY OF SUCH DAMAGE.
 
 module Tebako
-  VERSION = "0.12.8"
+  VERSION = "0.12.9"
 end
diff --git a/spec/packager/pass1_patch_spec.rb b/spec/packager/pass1_patch_spec.rb
@@ -201,11 +201,28 @@
       end
     end
 
-    context "when ruby_ver is ruby34" do
+    context "when ruby version is 3.3.7" do
+      let(:ruby_ver) { Tebako::RubyVersion.new("3.3.7") }
+      let(:patch) { described_class.new(mountpoint, ruby_ver) }
+
+      it "includes additional patches for MSys and ruby 3.3.7" do
+        expected_patch_map = base_patch_map.merge(
+          "ext/bigdecimal/bigdecimal.h" => described_class::EXT_BIGDECIMAL_BIGDECIMAL_H_PATCH,
+          "cygwin/GNUmakefile.in" => patch.send(:gnumakefile_in_patch_p1),
+          "ext/openssl/extconf.rb" => described_class::OPENSSL_EXTCONF_RB_PATCH,
+          "lib/rubygems/openssl.rb" => described_class::RUBYGEM_OPENSSL_RB_PATCH,
+          "include/ruby/onigmo.h" => described_class::INCLUDE_RUBY_ONIGMO_H_PATCH,
+          "win32/winmain.c" => described_class::WIN32_WINMAIN_C_PATCH
+        )
+        expect(patch.patch_map).to eq(expected_patch_map)
+      end
+    end
+
+    context "when ruby version is 3.4.1" do
       let(:ruby_ver) { Tebako::RubyVersion.new("3.4.1") }
       let(:patch) { described_class.new(mountpoint, ruby_ver) }
 
-      it "includes additional patches for MSys and ruby34" do
+      it "includes additional patches for MSys and ruby 3.4.1" do
         expected_patch_map = base_patch_map.merge(
           "cygwin/GNUmakefile.in" => patch.send(:gnumakefile_in_patch_p1),
           "ext/openssl/extconf.rb" => described_class::OPENSSL_EXTCONF_RB_PATCH,

diff --git a/spec/ruby_version_spec.rb b/spec/ruby_version_spec.rb
@@ -115,6 +115,10 @@
         expect(version.ruby33?).to be false
       end
 
+      it "returns false for ruby337?" do
+        expect(version.ruby337?).to be false
+      end
+
       it "returns false for ruby34?" do
         expect(version.ruby34?).to be false
       end
@@ -151,6 +155,50 @@
         expect(version.ruby33?).to be true
       end
 
+      it "returns false for ruby337?" do
+        expect(version.ruby337?).to be false
+      end
+
+      it "returns false for ruby34?" do
+        expect(version.ruby34?).to be false
+      end
+
+      it "returns '3.3.0' for api_version" do
+        expect(version.api_version).to eq("3.3.0")
+      end
+
+      it "returns '330' for lib_version" do
+        expect(version.lib_version).to eq("330")
+      end
+    end
+
+    context "with version 3.3.7" do
+      let(:version) { Tebako::RubyVersion.new("3.3.7") }
+
+      it "returns true for ruby3x?" do
+        expect(version.ruby3x?).to be true
+      end
+
+      it "returns true for ruby31?" do
+        expect(version.ruby31?).to be true
+      end
+
+      it "returns true for ruby32?" do
+        expect(version.ruby32?).to be true
+      end
+
+      it "returns false for ruby32only?" do
+        expect(version.ruby32only?).to be false
+      end
+
+      it "returns true for ruby33?" do
+        expect(version.ruby33?).to be true
+      end
+
+      it "returns true for ruby337?" do
+        expect(version.ruby337?).to be true
+      end
+
       it "returns false for ruby34?" do
         expect(version.ruby34?).to be false
       end
@@ -187,6 +235,10 @@
         expect(version.ruby33?).to be true
       end
 
+      it "returns true for ruby337?" do
+        expect(version.ruby337?).to be true
+      end
+
       it "returns true for ruby34?" do
         expect(version.ruby34?).to be true
       end