Fixups for OpenSSL 3 (#6)

Author: MSP-Greg

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

@@ -33,7 +33,7 @@ jobs:
       - name: Set up Ruby
         uses: ruby/setup-ruby@v1
         with:
-          ruby-version: mingw
+          ruby-version: ucrt
         timeout-minutes: 7
 
       - name: Update msys2 tools 7z and Upload
@@ -52,10 +52,10 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - { gcc: mingw64    , ruby: mingw }
+          - { gcc: mingw64    , ruby: '3.0' }
           - { gcc: mingw64-3.0, ruby: mingw }
-          - { gcc: ucrt64     , ruby: ucrt  }
-          - { gcc: ucrt64-3.0 , ruby: 3.2   }
+          - { gcc: ucrt64     , ruby: 3.1   }
+          - { gcc: ucrt64-3.0 , ruby: ucrt  }
     steps:
       - name: Checkout
         uses: actions/checkout@v3

common.rb

@@ -34,6 +34,12 @@ module Common
   PACMAN     = 'C:/msys64/usr/bin/pacman.exe'
   BASH       = 'C:/msys64/usr/bin/bash.exe'
 
+  SSL_3_SAVE_FILES = %w[
+    bin/libcrypto-3-x64.dll
+    bin/libssl-3-x64.dll
+    etc/ssl/openssl.cnf
+  ]
+
   def gh_api_graphql(http, query)
     body = {}
     body["query"] = query

create_gcc_pkg.rb

@@ -44,12 +44,6 @@ class << self
       end
 
     MSYS2_PKG = "#{MSYS2_ROOT}/#{PKG_DIR}"
-
-    SSL_3_SAVE_FILES = %w[
-      bin/libcrypto-3-x64.dll
-      bin/libssl-3-x64.dll
-      etc/ssl/openssl.cnf
-    ]
 
     SSL_1_DLLS = %w[bin/libcrypto-1_1-x64.dll bin/libssl-1_1-x64.dll]
 
@@ -134,11 +128,15 @@ def install_gcc
 
       pkgs = (base_gcc + base_ruby).unshift('').join " #{PKG_PRE}"
 
+      SSL_3_SAVE_FILES.each do |fn|
+        FileUtils.remove_file "#{MSYS2_PKG}/#{fn}" if File.exist? "#{MSYS2_PKG}/#{fn}"
+      end
+
       # May not be needed, but...
       # Note that OpenSSL may need to be ignored
       if PKG_NAME.end_with?('-3.0')
         pacman_syuu
-      else
+     else
         pacman_syuu
       end
 

create_msys2_pkg.rb

@@ -14,15 +14,22 @@ class << self
 
     include Common
 
-    MSYS2_ROOT = 'C:/msys64'
     TEMP = ENV.fetch('RUNNER_TEMP') { ENV.fetch('RUNNER_WORKSPACE') { ENV['TEMP'] } }
     ORIG_MSYS2 = "#{TEMP}/msys64".gsub '\\', '/'
 
     SYNC  = 'var/lib/pacman/sync'
     LOCAL = 'var/lib/pacman/local'
     CACHE = 'var/cache/pacman/pkg'
 
+    MSYS2_PKG = RUBY_PLATFORM.include?('ucrt') ?
+      "#{MSYS2_ROOT}/ucrt64" : "#{MSYS2_ROOT}/mingw64"
+
     def update_msys2
+
+      SSL_3_SAVE_FILES.each do |fn|
+        FileUtils.remove_file "#{MSYS2_PKG}/#{fn}" if File.exist? "#{MSYS2_PKG}/#{fn}"
+      end
+
       updated_keys = pacman_syuu
 
       pkgs = 'autoconf-wrapper autogen automake-wrapper bison diffutils libtool m4 make patch re2c texinfo texinfo-tex compression'