From f741ee57d534e20b8dd48b634235fb7243ba8d1f Mon Sep 17 00:00:00 2001 From: Lars Kanis Date: Mon, 25 Dec 2023 10:57:13 +0100 Subject: [PATCH] Add RubyInstaller-3.3.0 and remove ruby-2.7 from CI, which is EOL --- .github/workflows/ci.yml | 20 ++++----- CHANGELOG-3.3.md | 5 +++ packages/ri-msys/Rakefile | 4 +- packages/ri/Rakefile | 4 +- .../rubyinstaller-3.3.0-x64-msvcrt.files | 5 +++ .../rubyinstaller-3.3.0-x64-ucrt.files | 5 +++ .../rubyinstaller-3.3.0-x86-msvcrt.files | 5 +++ recipes/sandbox/rubyinstaller-3.3.0.files | 41 +++++++++++++++++++ 8 files changed, 75 insertions(+), 14 deletions(-) create mode 100644 CHANGELOG-3.3.md create mode 100644 recipes/sandbox/rubyinstaller-3.3.0-x64-msvcrt.files create mode 100644 recipes/sandbox/rubyinstaller-3.3.0-x64-ucrt.files create mode 100644 recipes/sandbox/rubyinstaller-3.3.0-x86-msvcrt.files create mode 100644 recipes/sandbox/rubyinstaller-3.3.0.files diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f906b9020..2c02e8c4f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -11,6 +11,16 @@ jobs: fail-fast: false matrix: include: + - target_ruby: "3.3.0" + arch: "x86-msvcrt" + build_ruby: "3.1.4/x64" + run_mri_spec: v3_3_0 + + - target_ruby: "3.3.0" + arch: "x64-ucrt" + build_ruby: "3.1.4/x64" + run_mri_spec: v3_3_0 + - target_ruby: "3.2.2" arch: "x86-msvcrt" build_ruby: "3.1.4/x64" @@ -41,16 +51,6 @@ jobs: build_ruby: "2.7.8/x64" run_mri_spec: v3_0_6 - - target_ruby: "2.7.8" - arch: "x86-msvcrt" - build_ruby: "3.0.6/x64" - run_mri_spec: v2_7_8 - - - target_ruby: "2.7.8" - arch: "x64-msvcrt" - build_ruby: "3.0.6/x64" - run_mri_spec: v2_7_8 - - target_ruby: "head" arch: "x64-ucrt" build_ruby: "3.0.6/x64" diff --git a/CHANGELOG-3.3.md b/CHANGELOG-3.3.md new file mode 100644 index 000000000..91a10e5c0 --- /dev/null +++ b/CHANGELOG-3.3.md @@ -0,0 +1,5 @@ +## RubyInstaller-3.3.0-1 - 2023-12-25 + +This is the first release based on ruby-3.3.0: https://www.ruby-lang.org/en/news/2023/12/25/ruby-3-3-0-released/ + +### Changes compared to RubyInstaller-3.2.2-1 diff --git a/packages/ri-msys/Rakefile b/packages/ri-msys/Rakefile index 2c69d8e81..89f952dd0 100644 --- a/packages/ri-msys/Rakefile +++ b/packages/ri-msys/Rakefile @@ -51,12 +51,12 @@ end ovl_glob('recipes/*/task.rake').each{|f| load(ovl_expand_file(f)) } ruby_arch_packages = %w[x64-ucrt].map do |arch| - %w[3.1.4-1 3.2.2-1 head].map do |packagever| + %w[3.1.4-1 3.2.2-1 3.3.0-1 head].map do |packagever| RubyPackage.new( packagever: packagever, arch: arch, rootdir: __dir__ ).freeze end end ruby_arch_packages += %w[x64-msvcrt x86-msvcrt].map do |arch| - %w[2.4.10-2 2.5.9-1 2.6.10-1 2.7.8-1 3.0.6-1 3.1.4-1 3.2.2-1 head].map do |packagever| + %w[2.4.10-2 2.5.9-1 2.6.10-1 2.7.8-1 3.0.6-1 3.1.4-1 3.2.2-1 3.3.0-1 head].map do |packagever| RubyPackage.new( packagever: packagever, arch: arch, rootdir: __dir__ ).freeze end end diff --git a/packages/ri/Rakefile b/packages/ri/Rakefile index a43c057d1..455c1c11d 100644 --- a/packages/ri/Rakefile +++ b/packages/ri/Rakefile @@ -46,12 +46,12 @@ end ovl_glob('recipes/*/task.rake').each{|f| load(ovl_expand_file(f)) } ruby_arch_packages = %w[x64-ucrt].map do |arch| - %w[3.1.4-1 3.2.2-1 head].map do |packagever| + %w[3.1.4-1 3.2.2-1 3.3.0-1 head].map do |packagever| RubyPackage.new( packagever: packagever, arch: arch, rootdir: __dir__ ).freeze end end ruby_arch_packages += %w[x64-msvcrt x86-msvcrt].map do |arch| - %w[2.4.10-2 2.5.9-1 2.6.10-1 2.7.8-1 3.0.6-1 3.1.4-1 3.2.2-1 head].map do |packagever| + %w[2.4.10-2 2.5.9-1 2.6.10-1 2.7.8-1 3.0.6-1 3.1.4-1 3.2.2-1 3.3.0-1 head].map do |packagever| RubyPackage.new( packagever: packagever, arch: arch, rootdir: __dir__ ).freeze end end diff --git a/recipes/sandbox/rubyinstaller-3.3.0-x64-msvcrt.files b/recipes/sandbox/rubyinstaller-3.3.0-x64-msvcrt.files new file mode 100644 index 000000000..c23dd84a2 --- /dev/null +++ b/recipes/sandbox/rubyinstaller-3.3.0-x64-msvcrt.files @@ -0,0 +1,5 @@ +bin/libcrypto-3-x64.dll +bin/libgcc_s_seh-1.dll +bin/libssl-3-x64.dll +bin/x64-msvcrt-ruby330.dll +lib/libx64-msvcrt-ruby330.dll.a diff --git a/recipes/sandbox/rubyinstaller-3.3.0-x64-ucrt.files b/recipes/sandbox/rubyinstaller-3.3.0-x64-ucrt.files new file mode 100644 index 000000000..06dffce74 --- /dev/null +++ b/recipes/sandbox/rubyinstaller-3.3.0-x64-ucrt.files @@ -0,0 +1,5 @@ +bin/libcrypto-3-x64.dll +bin/libgcc_s_seh-1.dll +bin/libssl-3-x64.dll +bin/x64-ucrt-ruby330.dll +lib/libx64-ucrt-ruby330.dll.a diff --git a/recipes/sandbox/rubyinstaller-3.3.0-x86-msvcrt.files b/recipes/sandbox/rubyinstaller-3.3.0-x86-msvcrt.files new file mode 100644 index 000000000..2536eab76 --- /dev/null +++ b/recipes/sandbox/rubyinstaller-3.3.0-x86-msvcrt.files @@ -0,0 +1,5 @@ +bin/libcrypto-3.dll +bin/libgcc_s_dw2-1.dll +bin/libssl-3.dll +bin/msvcrt-ruby330.dll +lib/libmsvcrt-ruby330.dll.a diff --git a/recipes/sandbox/rubyinstaller-3.3.0.files b/recipes/sandbox/rubyinstaller-3.3.0.files new file mode 100644 index 000000000..9fb59c23b --- /dev/null +++ b/recipes/sandbox/rubyinstaller-3.3.0.files @@ -0,0 +1,41 @@ +bin/bundle +bin/bundle.bat +bin/bundler +bin/bundler.bat +bin/erb +bin/erb.bat +bin/gem +bin/gem.cmd +bin/irb +bin/irb.bat +bin/racc +bin/racc.bat +bin/rake +bin/rake.bat +bin/rbs +bin/rbs.bat +bin/rdoc +bin/rdoc.bat +bin/ri +bin/ri.bat +bin/typeprof +bin/typeprof.bat +bin/libffi-8.dll +bin/libgmp-10.dll +bin/libwinpthread-1.dll +bin/libyaml-0-2.dll +bin/ruby.exe +bin/rubyw.exe +bin/zlib1.dll +include/ruby-3.3.0 +lib/engines-3/capi.dll +lib/engines-3/loader_attic.dll +lib/engines-3/padlock.dll +lib/ossl-modules/legacy.dll +lib/pkgconfig/ruby-3.3.pc +lib/ruby/3.3.0 +lib/ruby/gems/3.3.0 +lib/ruby/site_ruby/3.3.0 +lib/ruby/vendor_ruby/3.3.0 +share/doc/ruby/html/ +share/ri/