From ebf882070e710f66f0c622eb4fb4ae37d87c7926 Mon Sep 17 00:00:00 2001
From: murgatroid99 <mlumish@google.com>
Date: Wed, 26 Oct 2016 15:41:30 -0700
Subject: [PATCH] Decrease Node module cache time to avoid errors with
out-of-date modules
---
tools/run_tests/build_artifact_node.bat | 1 +
tools/run_tests/build_artifact_node.sh | 1 +
tools/run_tests/pre_build_node.bat | 5 ++---
tools/run_tests/pre_build_node.sh | 4 ++--
4 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/tools/run_tests/build_artifact_node.bat b/tools/run_tests/build_artifact_node.bat
index 2e0ecd21d0..890fb31a65 100644
--- a/tools/run_tests/build_artifact_node.bat
+++ b/tools/run_tests/build_artifact_node.bat
@@ -33,6 +33,7 @@ set PATH=%PATH%;C:\Program Files\nodejs\;%APPDATA%\npm
del /f /q BUILD || rmdir build /s /q
+call npm cache clean || goto :error
call npm update || goto :error
mkdir artifacts
diff --git a/tools/run_tests/build_artifact_node.sh b/tools/run_tests/build_artifact_node.sh
index 778a5c95d4..326cf29613 100755
--- a/tools/run_tests/build_artifact_node.sh
+++ b/tools/run_tests/build_artifact_node.sh
@@ -40,6 +40,7 @@ rm -rf build || true
mkdir -p artifacts
+npm cache clean
npm update
node_versions=( 0.12.0 1.0.0 1.1.0 2.0.0 3.0.0 4.0.0 5.0.0 6.0.0 7.0.0 )
diff --git a/tools/run_tests/pre_build_node.bat b/tools/run_tests/pre_build_node.bat
index a29456f9ed..addb01a2a4 100644
--- a/tools/run_tests/pre_build_node.bat
+++ b/tools/run_tests/pre_build_node.bat
@@ -29,6 +29,5 @@
set PATH=%PATH%;C:\Program Files\nodejs\;%APPDATA%\npm
-@rem Expire cache after 1 week
-call npm update --cache-min 604800
-
+@rem Expire cache after 1 day
+call npm update --cache-min 86400
diff --git a/tools/run_tests/pre_build_node.sh b/tools/run_tests/pre_build_node.sh
index 4879e7ad9b..e63be9da52 100755
--- a/tools/run_tests/pre_build_node.sh
+++ b/tools/run_tests/pre_build_node.sh
@@ -37,8 +37,8 @@ set -ex
export GRPC_CONFIG=${CONFIG:-opt}
-# Expire cache after 1 week
-npm update --cache-min 604800
+# Expire cache after 1 day
+npm update --cache-min 86400
npm install node-gyp-install
./node_modules/.bin/node-gyp-install
--
GitLab