Skip to content

Commit

Permalink
Development of ruby-3.5 started
Browse files Browse the repository at this point in the history
Remove EOL rubies from Rakefiles
  • Loading branch information
larskanis committed Dec 26, 2024
1 parent 9ad5871 commit c948ee1
Show file tree
Hide file tree
Showing 8 changed files with 29 additions and 27 deletions.
20 changes: 10 additions & 10 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,16 @@ jobs:
fail-fast: false
matrix:
include:
- target_ruby: "3.4.1"
arch: "x86-msvcrt"
build_ruby: "3.1.6/x64"
run_mri_spec: v3_4_1

- target_ruby: "3.4.1"
arch: "x64-ucrt"
build_ruby: "3.1.6/x64"
run_mri_spec: v3_4_1

- target_ruby: "3.3.6"
arch: "x86-msvcrt"
build_ruby: "3.1.6/x64"
Expand Down Expand Up @@ -41,16 +51,6 @@ jobs:
build_ruby: "3.0.7/x64"
run_mri_spec: v3_1_6

- target_ruby: "3.0.7"
arch: "x86-msvcrt"
build_ruby: "3.1.6/x64"
run_mri_spec: v3_0_7

- target_ruby: "3.0.7"
arch: "x64-msvcrt"
build_ruby: "3.1.6/x64"
run_mri_spec: v3_0_7

- target_ruby: "head"
arch: "x64-ucrt"
build_ruby: "3.0.7/x64"
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ Check the [wiki on how to use](https://github.com/oneclick/rubyinstaller2/wiki/F
- The last command lists all available RubyInstaller build targets.
The build targets consists of the following parts:
```
rake ri:ruby-3.0.5-x86-msvcrt:archive-7z
rake ri:ruby-3.4.1-x86-msvcrt:archive-7z
^ ^ ^ ^ ^- "archive-7z" => 7z archive of the rubyinstaller files
| | | | "installer-inno" => executable installer file
| | | '------- "msvcrt" => older type of C standard library
Expand Down
4 changes: 2 additions & 2 deletions packages/ri-msys/Rakefile
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ class RubyPackage < RubyInstaller::Build::Openstruct

self.rubyver, self.pkgrel = packagever.split("-", 2)
self.packagename = "rubyinstaller-devkit"
self.rubyver2 = packagever=='head' ? "3.4" : rubyver[/^\d+\.\d+/]
self.rubyver2 = packagever=='head' ? "3.5" : rubyver[/^\d+\.\d+/]
self.rubylibver = packagever=='head' ? "#{rubyver2}.0+1" : "#{rubyver2}.0"

case arch
Expand Down Expand Up @@ -56,7 +56,7 @@ ruby_arch_packages = %w[x64-ucrt].map do |arch|
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.7-1 3.1.6-1 3.2.6-1 3.3.6-2 head].map do |packagever|
%w[3.1.6-1 3.2.6-1 3.3.6-2 head].map do |packagever|
RubyPackage.new( packagever: packagever, arch: arch, rootdir: __dir__ ).freeze
end
end
Expand Down
2 changes: 1 addition & 1 deletion packages/ri/Rakefile
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ ruby_arch_packages = %w[x64-ucrt].map do |arch|
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.7-1 3.1.6-1 3.2.6-1 3.3.6-2 head].map do |packagever|
%w[3.1.6-1 3.2.6-1 3.3.6-2 head].map do |packagever|
RubyPackage.new( packagever: packagever, arch: arch, rootdir: __dir__ ).freeze
end
end
Expand Down
5 changes: 3 additions & 2 deletions recipes/sandbox/rubyinstaller-head-x64-msvcrt.files
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
bin/libcrypto-3-x64.dll
bin/libgcc_s_seh-1.dll
bin/libssl-3-x64.dll
bin/x64-msvcrt-ruby340.dll
lib/libx64-msvcrt-ruby340.dll.a
bin/libwinpthread-1.dll
bin/x64-msvcrt-ruby350.dll
lib/libx64-msvcrt-ruby350.dll.a
5 changes: 3 additions & 2 deletions recipes/sandbox/rubyinstaller-head-x64-ucrt.files
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
bin/libcrypto-3-x64.dll
bin/libgcc_s_seh-1.dll
bin/libssl-3-x64.dll
bin/x64-ucrt-ruby340.dll
lib/libx64-ucrt-ruby340.dll.a
bin/libwinpthread-1.dll
bin/x64-ucrt-ruby350.dll
lib/libx64-ucrt-ruby350.dll.a
5 changes: 3 additions & 2 deletions recipes/sandbox/rubyinstaller-head-x86-msvcrt.files
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
bin/libcrypto-3.dll
bin/libgcc_s_dw2-1.dll
bin/libssl-3.dll
bin/msvcrt-ruby340.dll
lib/libmsvcrt-ruby340.dll.a
bin/libwinpthread-1.dll
bin/msvcrt-ruby350.dll
lib/libmsvcrt-ruby350.dll.a
13 changes: 6 additions & 7 deletions recipes/sandbox/rubyinstaller-head.files
Original file line number Diff line number Diff line change
Expand Up @@ -22,16 +22,15 @@ 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.4.0+1
lib/pkgconfig/ruby-3.4.pc
lib/ruby/3.4.0+1
lib/ruby/gems/3.4.0+1
lib/ruby/site_ruby/3.4.0+1
lib/ruby/vendor_ruby/3.4.0+1
include/ruby-3.5.0+0
lib/pkgconfig/ruby-3.5.pc
lib/ruby/3.5.0+0
lib/ruby/gems/3.5.0+0
lib/ruby/site_ruby/3.5.0+0
lib/ruby/vendor_ruby/3.5.0+0
share/doc/ruby/html/
share/ri/

0 comments on commit c948ee1

Please sign in to comment.