When appropriate, don't upgrade OpenSSL with pacman -Syuu (#4)

Author: MSP-Greg

.github/workflows/windows-build-tools.yml

@@ -50,7 +50,7 @@ jobs:
         include:
           - { gcc: mingw64    , ruby: mingw }
           - { gcc: ucrt64     , ruby: ucrt  }
-          - { gcc: ucrt64-3.0 , ruby: head  }
+          - { gcc: ucrt64-3.0 , ruby: 3.2   }
     steps:
       - name: Checkout
         uses: actions/checkout@v3

common.rb

@@ -315,16 +315,19 @@ def refresh_keys
     end
   end
 
-  def pacman_syuu
+  def pacman_syuu(ignore = nil)
+    
     usr_bin = "#{MSYS2_ROOT}/usr/bin"
 
     exit 1 unless system "#{usr_bin}/sed -i 's/^CheckSpace/#CheckSpace/g' C:/msys64/etc/pacman.conf"
 
-    exec_check 'Updating all installed packages', "#{PACMAN} -Syuu  --noconfirm"
+    ignore = ignore ? "--ignore #{ignore}" : nil
+
+    exec_check 'Updating all installed packages', "#{PACMAN} -Syuu  --noconfirm #{ignore}"
 
     system 'taskkill /f /fi "MODULES eq msys-2.0.dll"'
 
-    exec_check 'Updating all installed packages (2nd pass)', "#{PACMAN} -Syuu  --noconfirm"
+    exec_check 'Updating all installed packages (2nd pass)', "#{PACMAN} -Syuu  --noconfirm #{ignore}"
 
     system 'taskkill /f /fi "MODULES eq msys-2.0.dll"'
 

create_gcc_pkg.rb

@@ -61,19 +61,30 @@ def openssl_upgrade
       exec_check "Install OpenSSL Upgrade", "pacman.exe -Udd --noconfirm --noprogressbar #{PKG_PRE}#{pkg_name}"
 
       # copy previous dlls back into MSYS2 folder
-      old_dlls.each { |fn| FileUtils.cp fn , "#{dll_root}/#{fn}" }
+      old_dlls.each do |fn|
+        unless File.exist? "#{dll_root}/#{fn}"
+          FileUtils.cp fn , "#{dll_root}/#{fn}"
+        end
+      end
     end
 
     def install_gcc
+      
       args = '--noconfirm --noprogressbar --needed'
       # zlib required by gcc, gdbm for older Rubies
       base_gcc  = %w[make pkgconf libmangle-git tools-git gcc]
-      base_ruby = %w[gdbm gmp libffi libyaml openssl ragel readline]
+      base_ruby = PKG_NAME.end_with?('-3.0') ?
+        %w[gdbm gmp libffi libyaml ragel readline] :
+        %w[gdbm gmp libffi libyaml openssl ragel readline]
 
       pkgs = (base_gcc + base_ruby).unshift('').join " #{PKG_PRE}"
 
       # may not be needed, but...
-      pacman_syuu
+      if PKG_NAME.end_with?('-3.0')
+        pacman_syuu "mingw-w64-ucrt-x86_64-openssl"
+      else
+        pacman_syuu
+      end
 
       exec_check "Updating the following #{PKG_PRE[0..-2]} packages:#{RST}\n" \
         "#{YEL}#{(base_gcc + base_ruby).join ' '}",