Browse Source

msvs 2022

Samuel Attard 10 months ago
parent
commit
60e769a12f

+ 1 - 0
.github/workflows/pipeline-segment-electron-test.yml

@@ -103,6 +103,7 @@ jobs:
         ELECTRON_DISABLE_SECURITY_WARNINGS: 1
         ELECTRON_SKIP_NATIVE_MODULE_TESTS: true
         DISPLAY: ':99.0'
+        NPM_CONFIG_MSVS_VERSION: '2022'
       run: |
         cd src/electron
         # Get which tests are on this shard

+ 1 - 1
script/nan-spec-runner.js

@@ -21,9 +21,9 @@ async function main () {
   const outDir = utils.getOutDir({ shouldLog: true });
   const nodeDir = path.resolve(BASE, 'out', outDir, 'gen', 'node_headers');
   const env = {
+    npm_config_msvs_version: '2019',
     ...process.env,
     npm_config_nodedir: nodeDir,
-    npm_config_msvs_version: '2019',
     npm_config_arch: process.env.NPM_CONFIG_ARCH,
     npm_config_yes: 'true'
   };

+ 1 - 1
script/spec-runner.js

@@ -191,9 +191,9 @@ async function installSpecModules (dir) {
   const CXXFLAGS = ['-std=c++17', process.env.CXXFLAGS].filter(x => !!x).join(' ');
 
   const env = {
+    npm_config_msvs_version: '2019',
     ...process.env,
     CXXFLAGS,
-    npm_config_msvs_version: '2019',
     npm_config_yes: 'true'
   };
   if (args.electronVersion) {