Add vcpkg tools to Path

Author: MSP-Greg

dist/index.js

@@ -1739,7 +1739,7 @@ const core = __webpack_require__(276)
 
 const { execSync, getInput } = __webpack_require__(498)
 
-let mingw = getInput('mingw')
+let mingw = getInput('mingw')  // only parsed for openssl
 let mswin = getInput('mswin')
 let choco = getInput('choco')
 let vcpkg = getInput('vcpkg')
@@ -1755,23 +1755,25 @@ const run = async () => {
     }
 
     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.includes('openssl')) { choco += ' openssl' }
     }
 
     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')
+        core.exportVariable('SSL_DIR', '--with-openssl-dir=C:\\openssl-win')
       }
     }
 
     if (vcpkg !== '') {
       execSync(`vcpkg --triplet x64-windows install ${vcpkg}`)
-      core.exportVariable('OPT_DIR', `--with-opt-dir=${process.env.VCPKG_INSTALLATION_ROOT}/installed/x64-windows`)
+      core.exportVariable('OPT_DIR', `--with-opt-dir=${process.env.VCPKG_INSTALLATION_ROOT}\\installed\\x64-windows`)
+      const vcpkgTools = `${process.env.VCPKG_INSTALLATION_ROOT}\\installed\\x64-windows\\tools`
+      if (fs.existsSync(vcpkgTools) && fs.readdirSync(vcpkgTools).length >= 0) {
+        core.addPath(vcpkgTools)
+        console.log(`Added to Path: ${vcpkgTools}`)
+      }
     }
 
   } catch (error) {

mswin.js

@@ -5,7 +5,7 @@ const core = require('@actions/core')
 
 const { execSync, getInput } = require('./common')
 
-let mingw = getInput('mingw')
+let mingw = getInput('mingw')  // only parsed for openssl
 let mswin = getInput('mswin')
 let choco = getInput('choco')
 let vcpkg = getInput('vcpkg')
@@ -21,23 +21,25 @@ export const run = async () => {
     }
 
     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.includes('openssl')) { choco += ' openssl' }
     }
 
     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')
+        core.exportVariable('SSL_DIR', '--with-openssl-dir=C:\\openssl-win')
       }
     }
 
     if (vcpkg !== '') {
       execSync(`vcpkg --triplet x64-windows install ${vcpkg}`)
-      core.exportVariable('OPT_DIR', `--with-opt-dir=${process.env.VCPKG_INSTALLATION_ROOT}/installed/x64-windows`)
+      core.exportVariable('OPT_DIR', `--with-opt-dir=${process.env.VCPKG_INSTALLATION_ROOT}\\installed\\x64-windows`)
+      const vcpkgTools = `${process.env.VCPKG_INSTALLATION_ROOT}\\installed\\x64-windows\\tools`
+      if (fs.existsSync(vcpkgTools) && fs.readdirSync(vcpkgTools).length >= 0) {
+        core.addPath(vcpkgTools)
+        console.log(`Added to Path: ${vcpkgTools}`)
+      }
     }
 
   } catch (error) {