From b33606486c7989df65eddd23e738bb279f6c8d96 Mon Sep 17 00:00:00 2001 From: Jason Lunn Date: Fri, 27 Dec 2024 13:24:47 -0500 Subject: [PATCH 1/2] Add a multi-platform Gemfile.lock #test-continuous --- .gitignore | 1 - ruby/Gemfile.lock | 50 +++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 50 insertions(+), 1 deletion(-) create mode 100644 ruby/Gemfile.lock diff --git a/.gitignore b/.gitignore index 7cbe5ec2a596..a54510bef76f 100644 --- a/.gitignore +++ b/.gitignore @@ -184,7 +184,6 @@ ruby/tests/utf8_pb.rb ruby/compatibility_tests/v3.0.0/protoc ruby/compatibility_tests/v3.0.0/tests/generated_code_pb.rb ruby/compatibility_tests/v3.0.0/tests/test_import_pb.rb -ruby/Gemfile.lock # IntelliJ CLion Config files and build output cmake/.idea diff --git a/ruby/Gemfile.lock b/ruby/Gemfile.lock new file mode 100644 index 000000000000..9947517d3bb9 --- /dev/null +++ b/ruby/Gemfile.lock @@ -0,0 +1,50 @@ +PATH + remote: . + specs: + google-protobuf (4.30.0-java) + ffi (~> 1) + ffi-compiler (~> 1) + rake (>= 13) + +GEM + remote: https://rubygems.org/ + specs: + bigdecimal (3.1.8) + bigdecimal (3.1.8-java) + ffi (1.17.0-aarch64-linux-gnu) + ffi (1.17.0-arm-linux-gnu) + ffi (1.17.0-arm64-darwin) + ffi (1.17.0-java) + ffi (1.17.0-x86-linux-gnu) + ffi (1.17.0-x86_64-darwin) + ffi (1.17.0-x86_64-linux-gnu) + ffi-compiler (1.3.2) + ffi (>= 1.15.5) + rake + power_assert (2.0.5) + rake (13.2.1) + rake-compiler (1.1.9) + rake + test-unit (3.6.7) + power_assert + +PLATFORMS + aarch64-linux + arm-linux + arm64-darwin + arm64-linux + java + x86-linux + x86_64-darwin + x86_64-linux + +DEPENDENCIES + bigdecimal + ffi (~> 1) + ffi-compiler (~> 1) + google-protobuf! + rake-compiler (~> 1.1.0) + test-unit (~> 3.0, >= 3.0.9) + +BUNDLED WITH + 2.4.10 From 2bf39f57130504324a3f1426a3616022c9692c98 Mon Sep 17 00:00:00 2001 From: Jason Lunn Date: Fri, 27 Dec 2024 14:00:47 -0500 Subject: [PATCH 2/2] Add release platforms --- ruby/Gemfile.lock | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/ruby/Gemfile.lock b/ruby/Gemfile.lock index 9947517d3bb9..0665182f33f0 100644 --- a/ruby/Gemfile.lock +++ b/ruby/Gemfile.lock @@ -11,13 +11,7 @@ GEM specs: bigdecimal (3.1.8) bigdecimal (3.1.8-java) - ffi (1.17.0-aarch64-linux-gnu) - ffi (1.17.0-arm-linux-gnu) - ffi (1.17.0-arm64-darwin) - ffi (1.17.0-java) - ffi (1.17.0-x86-linux-gnu) - ffi (1.17.0-x86_64-darwin) - ffi (1.17.0-x86_64-linux-gnu) + ffi (1.17.0) ffi-compiler (1.3.2) ffi (>= 1.15.5) rake @@ -34,7 +28,10 @@ PLATFORMS arm64-darwin arm64-linux java + x64-mingw-ucrt + x64-mingw32 x86-linux + x86-mingw32 x86_64-darwin x86_64-linux