Update for Actions MSYS2 installation, mswin

Author: MSP-Greg

.github/workflows/ruby.yml

@@ -22,6 +22,8 @@ jobs:
         with:
           ruby-version: ${{ matrix.ruby }}
           mingw: _upgrade_ openssl ragel
+          mswin: bison mingw-w64-x86_64-ragel
+          vcpkg: readline
 
       - name: Info
         run:  |

action.yml

@@ -6,19 +6,25 @@ inputs:
     description: 'Ruby version'
     default: ''
   apt-get:
-    description: 'Install Ubuntu packages'
+    description: 'Ubuntu - install packages'
     default: ''
   brew:
-    description: 'Install macOS packages'
+    description: 'macOS - install packages'
     default: ''
   mingw:
-    description: 'Install MSYS2 mingw64 packages'
+    description: 'MinGW - install MSYS2 mingw64 packages'
     default: ''
   msys2:
-    description: 'Install MSYS2 msys2 packages'
+    description: 'MinGW - install MSYS2 msys2 packages'
+    default: ''
+  mswin:
+    description: 'mswin - install MSYS2 packages (mingw64 packages need prefix)'
+    default: ''
+  choco:
+    description: 'mswin - install Chocolatey packages'
     default: ''
   vcpkg:
-    description: 'Install vcpkg packages'
+    description: 'mswin - install vcpkg packages'
     default: ''
 runs:
   using: 'node12'

dist/index.js

@@ -464,7 +464,8 @@ const { download, execSync, getInput } = __webpack_require__(498)
  * release contains all Ruby building dependencies, 
  * used when MSYS2 has server issues
  */
-const RELEASE_ASSET = 'msys2-2020-03-20'
+const RELEASE_ASSET = fs.lstatSync('C:\\msys64').isSymbolicLink() ?
+  'msys2-2020-03-20' : null
 
 // SSD drive, used for most downloads
 const drive = (process.env['GITHUB_WORKSPACE'] || 'C')[0] 
@@ -473,7 +474,7 @@ const tar = 'C:\\msys64\\usr\\bin\\tar.exe'
 
 // below are for setup of old Ruby DevKit
 const dirDK    = `${drive}:\\DevKit64`
-const oldDKTar = `/${drive}/DevKit64/mingw/x86_64-w64-mingw32`
+const dirDKTar = `/${drive}/DevKit64/mingw/x86_64-w64-mingw32`
 
 const dlPath = `${process.env.RUNNER_TEMP}\\srp`
 if (!fs.existsSync(dlPath)) {
@@ -535,6 +536,7 @@ const openssl = async () => {
     const uri = `https://dl.bintray.com/larskanis/rubyinstaller2-packages/${pre.trim()}openssl-1.0.2.t-1-any.pkg.tar.xz`
     const fn = `${dlPath}\\ri2.tar.xz`
     await download(uri, fn)
+    execSync(`pacman.exe -R --noconfirm --noprogressbar ${pre.trim()}openssl`)
     execSync(`pacman.exe -Udd --noconfirm --noprogressbar ${fn}`)
     mingw = mingw.replace(/openssl/gi, '').trim()
   }
@@ -587,13 +589,11 @@ const installDevKit = async () => {
 const setPathDevKit = () => {
   let aryPath = process.env.PATH.split(path.delimiter)
   const rubyPath = aryPath.shift()
-  // two msys2 paths
-  aryPath.shift()
-  aryPath.shift()
-  aryPath.unshift(`${dirDK}\\mingw\\x86_64-w64-mingw32\\bin`)
-  aryPath.unshift(`${dirDK}\\mingw\\bin`)
-  aryPath.unshift(`${dirDK}\\bin`)
-  aryPath.unshift(rubyPath)
+  // remove two msys2 paths, add devkit paths
+  aryPath.splice(0, 2,
+    rubyPath, `${dirDK}\\mingw\\x86_64-w64-mingw32\\bin`,
+    `${dirDK}\\mingw\\bin`, `${dirDK}\\bin`
+  )
   core.exportVariable('Path', aryPath.join(path.delimiter))
 }
 
@@ -637,7 +637,7 @@ const runMingw = async () => {
           let fn = `${dlPath}\\${item.pkg}.tar.lzma`
           await download(item.uri, fn)
           fn = fn.replace(/:/, '').replace(/\\/g, '/')
-          let cmd = `${tar} --lzma -C ${oldDKTar} -xf /${fn}`
+          let cmd = `${tar} --lzma -C ${dirDKTar} -xf /${fn}`
           execSync(cmd)
         }
       }
@@ -1627,13 +1627,11 @@ module.exports = require("fs");
     else if ( platform === 'darwin')              { runner = __webpack_require__(924 ) }
     else if (platform === 'win32'  ) {
       const ruby = common.ruby()
-      
+
       if      ( ruby.platform.includes('mingw') ) { runner = __webpack_require__(505) }
       else if ( ruby.platform.includes('mswin') ) { runner = __webpack_require__(894) }
-      // pass Ruby props to runner
-      if (runner) { runner.setRuby(ruby) }
-      
-      // choco, vcpkg, etc
+
+      if (runner) { runner.setRuby(ruby) }  // pass Ruby info to runner
     }
 
     if (runner) { await runner.run() }
@@ -1733,7 +1731,6 @@ module.exports = __webpack_require__(525);
 "use strict";
 __webpack_require__.r(__webpack_exports__);
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "setRuby", function() { return setRuby; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "openssl", function() { return openssl; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "run", function() { return run; });
 
 
@@ -1743,27 +1740,38 @@ const core = __webpack_require__(276)
 const { execSync, getInput } = __webpack_require__(498)
 
 let mingw = getInput('mingw')
+let mswin = getInput('mswin')
+let choco = getInput('choco')
 let vcpkg = getInput('vcpkg')
 
 let ruby                                   // eslint-disable-line no-unused-vars
 
 const setRuby = (_ruby) => { ruby = _ruby }
 
-// installs 1.1.1d
-const openssl = async () => {
-  execSync('C:\\ProgramData\\Chocolatey\\bin\\choco install --no-progress openssl')
-  fs.renameSync('C:\\Program Files\\OpenSSL-Win64', 'C:\\openssl-win')
-  core.exportVariable('SSL_DIR', '--with-openssl-dir=C:/openssl-win')
-  mingw = mingw.replace(/openssl/gi, '').trim()
-}
-
 const run = async () => {
   try {
-    if (mingw.includes('openssl')) { openssl() }
-    
+    if (mswin !== '') {
+      execSync(`pacman.exe -S --noconfirm --noprogressbar --needed ${mswin}`)
+    }
+
+    if (mingw.includes('openssl')) {
+      execSync(`choco install --no-progress openssl`)
+      fs.renameSync('C:\\Program Files\\OpenSSL-Win64', 'C:\\openssl-win')
+      core.exportVariable('SSL_DIR', '--with-openssl-dir=C:/openssl-win')
+      choco = choco.replace(/openssl/gi, '').trim()
+    }
+
+    if (choco !== '') {
+      execSync(`choco install --no-progress ${choco}`)
+      if (choco.includes('openssl')) {
+        fs.renameSync('C:\\Program Files\\OpenSSL-Win64', 'C:\\openssl-win')
+        core.exportVariable('SSL_DIR', '--with-openssl-dir=C:/openssl-win')
+      }
+    }
+
     if (vcpkg !== '') {
       execSync(`vcpkg --triplet x64-windows install ${vcpkg}`)
-      core.addPath(`${process.env.VCPKG_INSTALLATION_ROOT}\\installed\\x64-windows\\tools`)
+      core.exportVariable('OPT_DIR', `--with-opt-dir=${process.env.VCPKG_INSTALLATION_ROOT}/installed/x64-windows`)
     }
 
   } catch (error) {

index.js

@@ -25,13 +25,11 @@
     else if ( platform === 'darwin')              { runner = require('./brew' ) }
     else if (platform === 'win32'  ) {
       const ruby = common.ruby()
-      
+
       if      ( ruby.platform.includes('mingw') ) { runner = require('./mingw') }
       else if ( ruby.platform.includes('mswin') ) { runner = require('./mswin') }
-      // pass Ruby props to runner
-      if (runner) { runner.setRuby(ruby) }
-      
-      // choco, vcpkg, etc
+
+      if (runner) { runner.setRuby(ruby) }  // pass Ruby info to runner
     }
 
     if (runner) { await runner.run() }

mingw.js

@@ -10,7 +10,8 @@ const { download, execSync, getInput } = require('./common')
  * release contains all Ruby building dependencies, 
  * used when MSYS2 has server issues
  */
-const RELEASE_ASSET = 'msys2-2020-03-20'
+const RELEASE_ASSET = fs.lstatSync('C:\\msys64').isSymbolicLink() ?
+  'msys2-2020-03-20' : null
 
 // SSD drive, used for most downloads
 const drive = (process.env['GITHUB_WORKSPACE'] || 'C')[0] 
@@ -19,7 +20,7 @@ const tar = 'C:\\msys64\\usr\\bin\\tar.exe'
 
 // below are for setup of old Ruby DevKit
 const dirDK    = `${drive}:\\DevKit64`
-const oldDKTar = `/${drive}/DevKit64/mingw/x86_64-w64-mingw32`
+const dirDKTar = `/${drive}/DevKit64/mingw/x86_64-w64-mingw32`
 
 const dlPath = `${process.env.RUNNER_TEMP}\\srp`
 if (!fs.existsSync(dlPath)) {
@@ -81,6 +82,7 @@ const openssl = async () => {
     const uri = `https://dl.bintray.com/larskanis/rubyinstaller2-packages/${pre.trim()}openssl-1.0.2.t-1-any.pkg.tar.xz`
     const fn = `${dlPath}\\ri2.tar.xz`
     await download(uri, fn)
+    execSync(`pacman.exe -R --noconfirm --noprogressbar ${pre.trim()}openssl`)
     execSync(`pacman.exe -Udd --noconfirm --noprogressbar ${fn}`)
     mingw = mingw.replace(/openssl/gi, '').trim()
   }
@@ -133,13 +135,11 @@ const installDevKit = async () => {
 const setPathDevKit = () => {
   let aryPath = process.env.PATH.split(path.delimiter)
   const rubyPath = aryPath.shift()
-  // two msys2 paths
-  aryPath.shift()
-  aryPath.shift()
-  aryPath.unshift(`${dirDK}\\mingw\\x86_64-w64-mingw32\\bin`)
-  aryPath.unshift(`${dirDK}\\mingw\\bin`)
-  aryPath.unshift(`${dirDK}\\bin`)
-  aryPath.unshift(rubyPath)
+  // remove two msys2 paths, add devkit paths
+  aryPath.splice(0, 2,
+    rubyPath, `${dirDK}\\mingw\\x86_64-w64-mingw32\\bin`,
+    `${dirDK}\\mingw\\bin`, `${dirDK}\\bin`
+  )
   core.exportVariable('Path', aryPath.join(path.delimiter))
 }
 
@@ -183,7 +183,7 @@ const runMingw = async () => {
           let fn = `${dlPath}\\${item.pkg}.tar.lzma`
           await download(item.uri, fn)
           fn = fn.replace(/:/, '').replace(/\\/g, '/')
-          let cmd = `${tar} --lzma -C ${oldDKTar} -xf /${fn}`
+          let cmd = `${tar} --lzma -C ${dirDKTar} -xf /${fn}`
           execSync(cmd)
         }
       }

mswin.js

@@ -6,27 +6,38 @@ const core = require('@actions/core')
 const { execSync, getInput } = require('./common')
 
 let mingw = getInput('mingw')
+let mswin = getInput('mswin')
+let choco = getInput('choco')
 let vcpkg = getInput('vcpkg')
 
 let ruby                                   // eslint-disable-line no-unused-vars
 
 export const setRuby = (_ruby) => { ruby = _ruby }
 
-// installs 1.1.1d
-export const openssl = async () => {
-  execSync('C:\\ProgramData\\Chocolatey\\bin\\choco install --no-progress openssl')
-  fs.renameSync('C:\\Program Files\\OpenSSL-Win64', 'C:\\openssl-win')
-  core.exportVariable('SSL_DIR', '--with-openssl-dir=C:/openssl-win')
-  mingw = mingw.replace(/openssl/gi, '').trim()
-}
-
 export const run = async () => {
   try {
-    if (mingw.includes('openssl')) { openssl() }
-    
+    if (mswin !== '') {
+      execSync(`pacman.exe -S --noconfirm --noprogressbar --needed ${mswin}`)
+    }
+
+    if (mingw.includes('openssl')) {
+      execSync(`choco install --no-progress openssl`)
+      fs.renameSync('C:\\Program Files\\OpenSSL-Win64', 'C:\\openssl-win')
+      core.exportVariable('SSL_DIR', '--with-openssl-dir=C:/openssl-win')
+      choco = choco.replace(/openssl/gi, '').trim()
+    }
+
+    if (choco !== '') {
+      execSync(`choco install --no-progress ${choco}`)
+      if (choco.includes('openssl')) {
+        fs.renameSync('C:\\Program Files\\OpenSSL-Win64', 'C:\\openssl-win')
+        core.exportVariable('SSL_DIR', '--with-openssl-dir=C:/openssl-win')
+      }
+    }
+
     if (vcpkg !== '') {
       execSync(`vcpkg --triplet x64-windows install ${vcpkg}`)
-      core.addPath(`${process.env.VCPKG_INSTALLATION_ROOT}\\installed\\x64-windows\\tools`)
+      core.exportVariable('OPT_DIR', `--with-opt-dir=${process.env.VCPKG_INSTALLATION_ROOT}/installed/x64-windows`)
     }
 
   } catch (error) {