Merge pull request #144225 from microsoft/robo/fix_ci_release_1_65

ci: fix build with latest node-gyp
microsoft · Mar 2, 2022 · b5205cc · b5205cc
2 parents 04a1079 + 835e8b2
commit b5205cc
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -13,7 +13,7 @@ on:
 jobs:
   windows:
     name: Windows
-    runs-on: windows-latest
+    runs-on: windows-2019
     timeout-minutes: 60
     env:
       CHILD_CONCURRENCY: "1"

diff --git a/.github/workflows/rich-navigation.yml b/.github/workflows/rich-navigation.yml
@@ -10,7 +10,7 @@ on:
 
 jobs:
   richnav:
-    runs-on: windows-latest
+    runs-on: windows-2019
     steps:
       - uses: actions/checkout@v2
 

diff --git a/build/azure-pipelines/darwin/product-build-darwin.yml b/build/azure-pipelines/darwin/product-build-darwin.yml
@@ -79,6 +79,10 @@ steps:
       set -e
       export npm_config_arch=$(VSCODE_ARCH)
       export npm_config_node_gyp=$(which node-gyp)
+      # Electron <= 13 does not ship with correct config.gypi headers,
+      # remove this once we update to newer versions.
+      # Refs https://github.com/nodejs/node-gyp/pull/2497
+      export npm_config_force_process_config=true
 
       for i in {1..3}; do # try 3 times, for Terrapin
         yarn --frozen-lockfile && break