From 7a7d27397a32b8d03b4cca85e02a3e0e89edca70 Mon Sep 17 00:00:00 2001 From: deepak1556 Date: Sat, 5 Dec 2020 07:03:28 -0800 Subject: [PATCH] chore: fix cache condition for native modules --- build/.cachesalt | 2 +- build/azure-pipelines/darwin/product-build-darwin.yml | 1 - build/azure-pipelines/linux/product-build-linux.yml | 6 +++--- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/build/.cachesalt b/build/.cachesalt index a7a4d508274..661e359818e 100644 --- a/build/.cachesalt +++ b/build/.cachesalt @@ -1 +1 @@ -2020-11-30T16:21:34.566Z +2020-12-05T15:02:48.675Z diff --git a/build/azure-pipelines/darwin/product-build-darwin.yml b/build/azure-pipelines/darwin/product-build-darwin.yml index e2107fd73c9..28da2b70ee0 100644 --- a/build/azure-pipelines/darwin/product-build-darwin.yml +++ b/build/azure-pipelines/darwin/product-build-darwin.yml @@ -81,7 +81,6 @@ steps: npm install -g node-gyp@latest node-gyp --version displayName: Update node-gyp - condition: and(succeeded(), ne(variables['CacheRestored'], 'true')) - script: | set -e diff --git a/build/azure-pipelines/linux/product-build-linux.yml b/build/azure-pipelines/linux/product-build-linux.yml index 5d7e8cdb24f..489842b3b39 100644 --- a/build/azure-pipelines/linux/product-build-linux.yml +++ b/build/azure-pipelines/linux/product-build-linux.yml @@ -74,7 +74,6 @@ steps: npm install -g node-gyp@latest node-gyp --version displayName: Update node-gyp - condition: and(succeeded(), ne(variables['CacheRestored'], 'true')) - script: | set -e @@ -108,8 +107,9 @@ steps: set -e export CC=$(which gcc-4.8) export CXX=$(which g++-4.8) - cd remote - node-gyp rebuild + export npm_config_node_gyp=$(which node-gyp) + cd remote && rm -rf node_modules/ + yarn displayName: Rebuild remote modules with gcc-4.8 - script: |