Merge pull request #143 from rake-compiler/flavorjones-cherry-pick-improvements

Some small improvements

Author: flavorjones

.github/workflows/ci.yml

@@ -187,9 +187,10 @@ jobs:
         uses: actions/download-artifact@v4
         with:
           name: gem-${{ matrix.platform }}
+      - if: matrix.rubygems
+        run: gem update --system ${{ matrix.rubygems }}
       - name: Test gem-${{ matrix.platform }}
         run: |
-          gem update --system ${{ matrix.rubygems }}
           gem install --local *.gem --verbose
           cd test/rcd_test/
           bundle install
@@ -250,7 +251,7 @@ jobs:
           docker run --rm -v $PWD:/work -w /work \
             ${{ matrix.docker_platform}} ruby:${{ matrix.ruby }}${{ matrix.docker_tag }} \
             sh -c "
-              gem update --system ${{ matrix.rubygems }} &&
+              if test -n '${{ matrix.rubygems }}' ; then gem update --system ${{ matrix.rubygems }} ; fi &&
               gem install --local *.gem --verbose &&
               cd test/rcd_test/ &&
               bundle install &&

Dockerfile.mri.erb

@@ -10,28 +10,6 @@ RUN apt-get -y update && \
     apt-get install -y autoconf cmake pkg-config zlib1g-dev libreadline-dev libsqlite0-dev libssl-dev libyaml-dev libffi-dev && \
     rm -rf /var/lib/apt/lists/*
 
-##
-##  install rbenv and ruby-build
-##
-RUN groupadd -r rubyuser && useradd -r -g rubyuser -G sudo -p "" --create-home rubyuser
-
-ENV RBENV_ROOT=/usr/local/rbenv RBENV_RUBIES="2.5.9 3.1.3"
-
-# chown after running `rbenv init` because that command creates some subdirectories
-RUN git clone https://github.com/rbenv/rbenv.git      ${RBENV_ROOT} && \
-    git clone https://github.com/rbenv/ruby-build.git ${RBENV_ROOT}/plugins/ruby-build && \
-    \
-    echo "export RBENV_ROOT=/usr/local/rbenv" >> /etc/rubybashrc && \
-    echo "export PATH=$RBENV_ROOT/bin:\$PATH" >> /etc/rubybashrc && \
-    $RBENV_ROOT/bin/rbenv init - --no-rehash bash >> /etc/rubybashrc && \
-    echo "source /etc/rubybashrc" >> /etc/bashrc && \
-    echo "source /etc/rubybashrc" >> /etc/bash.bashrc && \
-    \
-    chown -R rubyuser:rubyuser ${RBENV_ROOT} && \
-    find ${RBENV_ROOT} -type d -print0 | sudo xargs -0 chmod g+sw
-ENV BASH_ENV=/etc/rubybashrc
-
-
 ##
 ## Install cross compilers
 ##
@@ -69,11 +47,35 @@ RUN /tmp/mk_osxcross.sh
 <% end %>
 
 
+##
+##  install rbenv and ruby-build
+##
+RUN groupadd -r rubyuser && useradd -r -g rubyuser -G sudo -p "" --create-home rubyuser
+
+ENV RBENV_ROOT=/usr/local/rbenv
+
+# chown after running `rbenv init` because that command creates some subdirectories
+RUN git clone https://github.com/rbenv/rbenv.git      ${RBENV_ROOT} && \
+    git clone https://github.com/rbenv/ruby-build.git ${RBENV_ROOT}/plugins/ruby-build && \
+    \
+    echo "export RBENV_ROOT=/usr/local/rbenv" >> /etc/rubybashrc && \
+    echo "export PATH=$RBENV_ROOT/bin:\$PATH" >> /etc/rubybashrc && \
+    $RBENV_ROOT/bin/rbenv init - --no-rehash bash >> /etc/rubybashrc && \
+    echo "source /etc/rubybashrc" >> /etc/bashrc && \
+    echo "source /etc/rubybashrc" >> /etc/bash.bashrc && \
+    \
+    chown -R rubyuser:rubyuser ${RBENV_ROOT} && \
+    find ${RBENV_ROOT} -type d -print0 | sudo xargs -0 chmod g+sw
+ENV BASH_ENV=/etc/rubybashrc
+
+
 ##
 ##  set up rake-compiler and install bootstrap rubies
 ##
 USER rubyuser
 
+ENV RBENV_RUBIES="2.5.9 3.1.6"
+
 # Install the bootstrap rubies
 RUN bash -c " \
       echo 'gem: --no-ri --no-rdoc --no-document' >> ~/.gemrc && \
@@ -111,18 +113,18 @@ RUN sudo mkdir -p /usr/local/rake-compiler && \
 xrubies_build_plan = if platform =~ /x64-mingw-ucrt/
   [
     # Rubyinstaller-3.1.0+ is platform x64-mingw-ucrt
-    ["3.4.1:3.3.5:3.2.0:3.1.0", "3.1.3"],
+    ["3.4.1:3.3.5:3.2.0:3.1.0", "3.1.6"],
   ]
 elsif platform =~ /x64-mingw32/
   [
     # Rubyinstaller prior to 3.1.0 is platform x64-mingw32
     ["2.6.0:2.5.0:2.4.0", "2.5.9"],
-    ["3.0.0:2.7.0", "3.1.3"],
+    ["3.0.0:2.7.0", "3.1.6"],
   ]
 else
   [
     ["2.6.0:2.5.0:2.4.0", "2.5.9"],
-    ["3.4.1:3.3.5:3.2.0:3.1.0:3.0.0:2.7.0", "3.1.3"],
+    ["3.4.1:3.3.5:3.2.0:3.1.0:3.0.0:2.7.0", "3.1.6"],
   ]
 end
 
@@ -167,9 +169,9 @@ RUN find /usr/local/rake-compiler/ruby -name rbconfig.rb | while read f ; do sed
 <% if platform =~ /darwin/ %>
 # ruby-3.2+ on darwin links with `-bundle_loader`,
 # - see https://github.com/rake-compiler/rake-compiler-dock/issues/87
-# - note that we do this for "3.[2-9].0" to match rubies 3.2 and later
-# - and we add a "*" on the end for "3.[2-9].0*" to match prereleases like "3.3.0+0"
-RUN find /usr/local/rake-compiler/ruby/*/*/lib/ruby/3.[2-9].0* -name rbconfig.rb | \
+# - note that we do this for "3.[2-9].*" to match rubies 3.2 and later
+# - and we use a "*" on the end instead of a digit to match prereleases like "3.3.0+0"
+RUN find /usr/local/rake-compiler/ruby/*/*/lib/ruby/3.[2-9].* -name rbconfig.rb | \
     while read f ; do sed -i 's/\["EXTDLDFLAGS"\] = "/&-Wl,-flat_namespace /' $f ; done
 <% end %>
 
@@ -216,7 +218,7 @@ 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.1.3"
+RUN bash -c "rbenv global 3.1.6"
 
 ENV RUBY_CC_VERSION=3.4.1:3.3.5:3.2.0:3.1.0:3.0.0:2.7.0:2.6.0:2.5.0:2.4.0
 

History.md

@@ -1,5 +1,10 @@
 # `rake-compiler/rake-compiler-dock` Changelog
 
+## next / unreleased
+
+- Base ruby updated to v3.1.6 (from v3.1.3).
+
+
 ## v1.7.1 / 2025-01-03
 
 - Bump rake-compiler dependency to v1.2.9 (from v1.2.5).