misc vcpkg updates

ruby · May 18, 2022 · 77cab63 · 77cab63
1 parent 99dbd8c
commit 77cab63
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 2 deletions.
diff --git a/dist/index.js b/dist/index.js
@@ -646,15 +646,30 @@ const run = async () => {
     }
 
     if (vcpkg !== '') {
+      const vcpkgRoot = process.env.VCPKG_INSTALLATION_ROOT.replace(/\\/g, '/')
+
+      // Update vcpkg
+      const cwd = process.cwd()
+      process.chdir(vcpkgRoot)
+      execSync('git pull -q')
+      execSync('bootstrap-vcpkg.bat')
+
+      // install packages
       msSt = grpSt(`vcpkg --triplet x64-windows install ${vcpkg}`)
       execSync(`vcpkg --triplet x64-windows install ${vcpkg}`)
-      const vcpkgRoot = process.env.VCPKG_INSTALLATION_ROOT.replace(/\\/g, '/')
+
+      // add vcpkg dll folder to path
+      const vcpkgBin = `${process.env.VCPKG_INSTALLATION_ROOT}\\installed\\x64-windows\\bin`
+      core.addPath(vcpkgBin)
+      console.log(`Added to Path: ${vcpkgBin}`)
+
       core.exportVariable('OPT_DIR', `--with-opt-dir=${vcpkgRoot}/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}`)
       }
+      process.chdir(cwd)
       grpEnd(msSt)
     }
   } catch (error) {

diff --git a/mswin.js b/mswin.js
@@ -51,15 +51,30 @@ export const run = async () => {
     }
 
     if (vcpkg !== '') {
+      const vcpkgRoot = process.env.VCPKG_INSTALLATION_ROOT.replace(/\\/g, '/')
+
+      // Update vcpkg
+      const cwd = process.cwd()
+      process.chdir(vcpkgRoot)
+      execSync('git pull -q')
+      execSync('bootstrap-vcpkg.bat')
+
+      // install packages
       msSt = grpSt(`vcpkg --triplet x64-windows install ${vcpkg}`)
       execSync(`vcpkg --triplet x64-windows install ${vcpkg}`)
-      const vcpkgRoot = process.env.VCPKG_INSTALLATION_ROOT.replace(/\\/g, '/')
+
+      // add vcpkg dll folder to path
+      const vcpkgBin = `${process.env.VCPKG_INSTALLATION_ROOT}\\installed\\x64-windows\\bin`
+      core.addPath(vcpkgBin)
+      console.log(`Added to Path: ${vcpkgBin}`)
+
       core.exportVariable('OPT_DIR', `--with-opt-dir=${vcpkgRoot}/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}`)
       }
+      process.chdir(cwd)
       grpEnd(msSt)
     }
   } catch (error) {