diff --git a/Dockerfile.mri.erb b/Dockerfile.mri.erb index d06be383..ba8656fb 100644 --- a/Dockerfile.mri.erb +++ b/Dockerfile.mri.erb @@ -108,7 +108,7 @@ ENV BASH_ENV=/etc/rubybashrc ## USER rubyuser -ENV RBENV_RUBIES="3.1.6 3.4.1" +ENV RBENV_RUBIES="3.1.7 3.4.5" # Install the bootstrap rubies RUN bash -c " \ @@ -148,21 +148,21 @@ RUN sudo mkdir -p /usr/local/rake-compiler && \ xrubies_build_plan = if platform =~ /x64-mingw-ucrt/ [ # Rubyinstaller-3.1+ is platform x64-mingw-ucrt - ["3.4.1:3.3.7:3.2.6:3.1.6", "3.4.1"], + ["3.4.5:3.3.9:3.2.9:3.1.7", "3.4.5"], ] elsif platform =~ /aarch64-mingw-ucrt/ [ - ["3.4.1", "3.1.6"], + ["3.4.5", "3.1.7"], ] elsif platform =~ /x64-mingw32/ [ # Rubyinstaller prior to 3.1 is platform x64-mingw32 - ["3.0.7:2.7.8", "3.1.6"], + ["3.0.7:2.7.8", "3.1.7"], ] else [ - ["2.7.8", "3.1.6"], - ["3.4.1:3.3.7:3.2.6:3.1.6:3.0.7", "3.4.1"], + ["2.7.8", "3.1.7"], + ["3.4.5:3.3.9:3.2.9:3.1.7:3.0.7", "3.4.5"], ] end @@ -174,7 +174,7 @@ RUN bash -c " \ export CPPFLAGS='<%= "-D__USE_MINGW_ANSI_STDIO=1" if platform =~ /x64-mingw-ucrt/ %>' && \ export CFLAGS='-O1 -fno-omit-frame-pointer -fno-fast-math -fstack-protector-strong <%= strip %>' && \ export LDFLAGS='-pipe <%= strip %>' && \ - <%= "export LIBS='-l:libssp.a' &&" if platform =~ /mingw/ %> \ + <%= "export LIBS='-l:libssp.a -lpthread' &&" if platform =~ /mingw/ %> \ <%= "export CC=#{target}-clang &&" if platform =~ /darwin/ %> \ export MAKE='make V=1' && \ rake-compiler cross-ruby VERSION=<%= xrubies %> HOST=<%= target %> && \ @@ -264,8 +264,8 @@ RUN echo 'source /etc/profile.d/rcd-env.sh' >> /etc/rubybashrc # Install sudoers configuration COPY build/sudoers /etc/sudoers.d/rake-compiler-dock -RUN bash -c "rbenv global 3.4.1" +RUN bash -c "rbenv global 3.4.5" -ENV RUBY_CC_VERSION=3.4.1:3.3.7:3.2.6:3.1.6:3.0.7:2.7.8 +ENV RUBY_CC_VERSION=3.4.5:3.3.9:3.2.9:3.1.7:3.0.7:2.7.8 CMD bash diff --git a/lib/rake_compiler_dock.rb b/lib/rake_compiler_dock.rb index 22cb513b..ecd87949 100644 --- a/lib/rake_compiler_dock.rb +++ b/lib/rake_compiler_dock.rb @@ -82,20 +82,20 @@ def exec(*args, &block) # # RakeCompilerDock.cross_rubies # # => { - # # "3.4" => "3.4.1", - # # "3.3" => "3.3.5", - # # "3.2" => "3.2.6", - # # "3.1" => "3.1.6", + # # "3.4" => "3.4.5", + # # "3.3" => "3.3.9", + # # "3.2" => "3.2.9", + # # "3.1" => "3.1.7", # # "3.0" => "3.0.7", # # "2.7" => "2.7.8", # # } # def cross_rubies { - "3.4" => "3.4.1", - "3.3" => "3.3.7", - "3.2" => "3.2.6", - "3.1" => "3.1.6", + "3.4" => "3.4.5", + "3.3" => "3.3.9", + "3.2" => "3.2.9", + "3.1" => "3.1.7", "3.0" => "3.0.7", "2.7" => "2.7.8", } @@ -112,13 +112,13 @@ def cross_rubies # # For example: # RakeCompilerDock.ruby_cc_version("2.7", "3.4") - # # => "3.4.1:2.7.8" + # # => "3.4.5:2.7.8" # # RakeCompilerDock.ruby_cc_version("~> 3.2") - # # => "3.4.1:3.3.7:3.2.6" + # # => "3.4.5:3.3.9:3.2.9" # # RakeCompilerDock.ruby_cc_version(Gem::Requirement.new("~> 3.2")) - # # => "3.4.1:3.3.7:3.2.6" + # # => "3.4.5:3.3.9:3.2.9" # def ruby_cc_version(*requirements) cross = cross_rubies