Create ucrt64-3.0 package with OpenSSL 3, Actions only push & cron (#2)

Author: MSP-Greg

.github/workflows/mswin.yml

@@ -1,9 +1,6 @@
 name: Windows MSWin Build Tools
 
 on:
-  pull_request:
-    branches:
-      - '*'
   push:
     branches:
       - '*'

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

@@ -1,9 +1,6 @@
 name: Windows MSYS2 Build Tools
 
 on:
-  pull_request:
-    branches:
-      - '*'
   push:
     branches:
       - '*'
@@ -51,8 +48,9 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - { gcc: mingw64, ruby: mingw }
-          - { gcc: ucrt64 , ruby: ucrt  }
+          - { gcc: mingw64    , ruby: mingw }
+          - { gcc: ucrt64     , ruby: ucrt  }
+          - { gcc: ucrt64-3.0 , ruby: head  }
     steps:
       - name: Checkout
         uses: actions/checkout@v3

common.rb

@@ -128,6 +128,49 @@ def response_ok(response_obj, msg, actions_group: false)
     end
   end
 
+  def download(uri_s, file)
+    retry_max = 3
+    retries = 0
+    uri = URI uri_s
+    redirect = nil
+    begin
+      Net::HTTP.start(uri.host, uri.port, :use_ssl => true) do |http|
+        http.verify_mode = OpenSSL::SSL::VERIFY_PEER
+        req = Net::HTTP::Get.new uri.request_uri
+        http.request req do |resp|
+          req['Connection'] = 'close'
+          case resp
+          when Net::HTTPSuccess then
+            File.open file, 'wb' do |io|
+              resp.read_body do |chunk|
+                io.write chunk
+              end
+            end
+          when Net::HTTPRedirection then
+            redirect = resp['location']
+            warn "redirected to #{URI(redirect).host}"
+          else
+            puts "Unknown issue connecting to:\n#{uri}\nCode: #{resp.code}  Class: #{resp.class}"
+            resp.value
+          end
+        end
+      end
+    rescue Errno::ECONNRESET => e
+      if retries > retry_max
+        raise e
+      else
+        puts "Retry"
+        retries += 1
+        sleep 2
+        retry
+      end
+    end
+    download(redirect, file) if redirect
+  rescue => e
+    STDOUT.syswrite "\nCannot connect to:\n#{uri.host}\n#{uri.request_uri}\n#{File.basename file}\n\n"
+    raise e
+  end
+
   def upload_7z_update(pkg_name, time)
     resp_obj   = nil
     body       = nil
@@ -158,11 +201,6 @@ def upload_7z_update(pkg_name, time)
 
     exit 1 if resp_obj.is_a? Net::HTTPResponse
 
-    unless current_asset_id
-      STDOUT.syswrite "#{END_GROUP}#{RED}current asset #{pkg_name}.7z not found#{RST}\n"
-      exit 1
-    end
-
     if old_asset_exists
       STDOUT.syswrite "#{END_GROUP}#{RED}old asset #{pkg_name}_old.7z exists#{RST}\n"
       exit 1
@@ -202,17 +240,21 @@ def upload_7z_update(pkg_name, time)
     gh_api_http do |http|
       time_start = Process.clock_gettime Process::CLOCK_MONOTONIC
 
-      resp_obj = gh_api_v3_patch http, USER_REPO, "releases/assets/#{current_asset_id}", {'name' => "#{pkg_name}_old.7z"}
-      break unless response_ok resp_obj, 'PATCH - rename current asset to old', actions_group: true
+      if current_asset_id
+        resp_obj = gh_api_v3_patch http, USER_REPO, "releases/assets/#{current_asset_id}", {'name' => "#{pkg_name}_old.7z"}
+        break unless response_ok resp_obj, 'PATCH - rename current asset to old', actions_group: true
+      end
 
       resp_obj = gh_api_v3_patch http, USER_REPO, "releases/assets/#{updated_asset_id}", {'name' => "#{pkg_name}.7z"}
       break unless response_ok resp_obj, 'PATCH - rename updated asset to current', actions_group: true
 
       ttl_time = format '%5.2f', (Process.clock_gettime(Process::CLOCK_MONOTONIC) - time_start).round(2)
       STDOUT.syswrite "Rename time: #{ttl_time} secs\n"
 
-      resp_obj = gh_api_v3_delete http, USER_REPO, "releases/assets/#{current_asset_id}"
-      break unless response_ok resp_obj, 'DELETE - remove old asset', actions_group: true
+      if current_asset_id
+        resp_obj = gh_api_v3_delete http, USER_REPO, "releases/assets/#{current_asset_id}"
+        break unless response_ok resp_obj, 'DELETE - remove old asset', actions_group: true
+      end
 
       resp_obj = gh_api_v3_get http, USER_REPO, "releases/#{release_id}"
       break unless response_ok resp_obj, 'GET - release notes response', actions_group: true

create_gcc_pkg.rb

@@ -19,18 +19,50 @@ class << self
     SYNC  = 'var/lib/pacman/sync'
     LOCAL = 'var/lib/pacman/local'
 
-    PKG_NAME, PKG_PRE =
-      case ARGV[0].downcase
-      when 'ucrt64'
+    PKG_DIR, PKG_PRE =
+      case ARGV[0].downcase[/[^-]+/]
+      when 'ucrt64', 'ucrt64-3.0'
         ['ucrt64', 'mingw-w64-ucrt-x86_64-']
-      when 'mingw64'
+      when 'mingw64', 'mingw64-3.0'
         ['mingw64', 'mingw-w64-x86_64-']
-      when 'mingw32'
+      when 'mingw32', 'mingw32-3.0'
         ['mingw32', 'mingw-w64-i686-']
       else
         STDOUT.syswrite "Invalid package type, must be ucrt64, mingw64, or mingw32\n"
         exit 1
       end
+    
+    PKG_NAME = ARGV[0].downcase
+
+    def add_ri2_key
+      # appveyor ri2 package signing key
+      key = 'F98B8484BE8BF1C5'
+      exec_check "pacman-key --init", "bash.exe -c \"pacman-key --init\""
+      exec_check "Get RI2 Key" , "bash.exe -c \"pacman-key --recv-keys #{key}\""
+      exec_check "Sign RI2 Key", "bash.exe -c \"pacman-key --lsign-key #{key}\""
+    end
+
+    def openssl_upgrade
+      add_ri2_key
+
+      pkg_name = "openssl-3.0.5-1-any.pkg.tar.zst"
+      pkg = "https://github.com/oneclick/rubyinstaller2-packages/releases/download/ci.ri2/#{PKG_PRE}#{pkg_name}"
+      pkg_sig = "#{pkg}.sig"
+      old_dlls = %w[libcrypto-1_1-x64.dll libssl-1_1-x64.dll]
+      dll_root = "#{MSYS2_ROOT}/#{PKG_DIR}/bin"
+
+      # save previous dll files so we can copy back into folder
+      old_dlls.each { |fn| FileUtils.cp "#{dll_root}/#{fn}", "." }
+
+      download pkg    , "./#{PKG_PRE}#{pkg_name}"
+      download pkg_sig, "./#{PKG_PRE}#{pkg_name}.sig"
+
+      # install package
+      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}" }
+    end
 
     def install_gcc
       args = '--noconfirm --noprogressbar --needed'
@@ -46,6 +78,10 @@ def install_gcc
       exec_check "Updating the following #{PKG_PRE[0..-2]} packages:#{RST}\n" \
         "#{YEL}#{(base_gcc + base_ruby).join ' '}",
         "#{PACMAN} -S #{args} #{pkgs}"
+
+      if PKG_NAME.end_with? '-3.0'
+        openssl_upgrade
+      end
     end
 
     # copies needed files from C:/msys64 to TEMP
@@ -56,8 +92,8 @@ def copy_to_temp
       end
 
       Dir.chdir "#{MSYS2_ROOT}/#{SYNC}" do
-        FileUtils.cp "#{PKG_NAME}.db", "#{TAR_DIR}/#{SYNC}"
-        FileUtils.cp "#{PKG_NAME}.db.sig", "#{TAR_DIR}/#{SYNC}"
+        FileUtils.cp "#{PKG_DIR}.db", "#{TAR_DIR}/#{SYNC}"
+        FileUtils.cp "#{PKG_DIR}.db.sig", "#{TAR_DIR}/#{SYNC}"
       end
 
       ary = Dir.glob "#{PKG_PRE}*", base: "#{MSYS2_ROOT}/#{LOCAL}"
@@ -68,12 +104,12 @@ def copy_to_temp
         ary.each { |dir| FileUtils.copy_entry dir, "#{local}/#{dir}" }
       end
 
-      FileUtils.copy_entry "#{MSYS2_ROOT}/#{PKG_NAME}", "#{TAR_DIR}/#{PKG_NAME}"
+      FileUtils.copy_entry "#{MSYS2_ROOT}/#{PKG_DIR}", "#{TAR_DIR}/#{PKG_DIR}"
     end
 
     # removes files contained in 'share' folder to reduce 7z file size
     def clean_package
-      share = "#{TAR_DIR}/#{PKG_NAME}/share"
+      share = "#{TAR_DIR}/#{PKG_DIR}/share"
 
       Dir.chdir "#{share}/doc" do
         ary = Dir.glob "*"
@@ -98,9 +134,9 @@ def clean_package
             str = f.read
             f.truncate 0
             f.rewind
-            str.gsub!(/^#{PKG_NAME}\/share\/doc\/\S+\s*/m , '')
-            str.gsub!(/^#{PKG_NAME}\/share\/info\/\S+\s*/m, '')
-            str.gsub!(/^#{PKG_NAME}\/share\/man\/\S+\s*/m , '')
+            str.gsub!(/^#{PKG_DIR}\/share\/doc\/\S+\s*/m , '')
+            str.gsub!(/^#{PKG_DIR}\/share\/info\/\S+\s*/m, '')
+            str.gsub!(/^#{PKG_DIR}\/share\/man\/\S+\s*/m , '')
             f.write "#{str.strip}\n\n"
           }
         end
@@ -124,10 +160,10 @@ def run
         "Installed #{PKG_PRE[0..-2]} Packages"
 
       if current_pkgs == updated_pkgs
-        STDOUT.syswrite "\n** No update to #{PKG_NAME} gcc tools needed **\n\n"
+        STDOUT.syswrite "\n** No update to #{PKG_DIR} gcc tools needed **\n\n"
         exit 0
       else
-        STDOUT.syswrite "\n#{GRN}** Creating and Uploading #{PKG_NAME} gcc tools 7z **#{RST}\n\n"
+        STDOUT.syswrite "\n#{GRN}** Creating and Uploading #{PKG_DIR} gcc tools 7z **#{RST}\n\n"
       end
 
       copy_to_temp