diff options
| author |  Michael Lumish <mlumish@google.com> | 2016-10-26 16:38:34 -0700 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2016-10-26 16:38:34 -0700 |
| commit | 7e15bd0b202ec88c486918b931f68476b0c47edf (patch) | |
| tree | 87dfc26422dcd698414ab3ef6394a2b03e27d440 | |
| parent | 6490409be995fc9dd329579f089b086d1ee4056a (diff) | |
| parent | 06fbca03d0dba821b49f7e05860a0b43cd90d19a (diff) | |
Merge pull request #8529 from murgatroid99/node_fix_module_caching
Decrease Node module cache time to avoid errors with out-of-date modules
| -rw-r--r-- | tools/run_tests/build_artifact_node.bat | 3 | ||||
| -rwxr-xr-x | tools/run_tests/build_artifact_node.sh | 3 | ||||
| -rw-r--r-- | tools/run_tests/pre_build_node.bat | 5 | ||||
| -rwxr-xr-x | tools/run_tests/pre_build_node.sh | 4 |
4 files changed, 8 insertions, 7 deletions
diff --git a/tools/run_tests/build_artifact_node.bat b/tools/run_tests/build_artifact_node.bat index 2e0ecd21d0..2a1fe5fd92 100644 --- a/tools/run_tests/build_artifact_node.bat +++ b/tools/run_tests/build_artifact_node.bat @@ -27,12 +27,13 @@ @rem (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE @rem OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -set 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 +set 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 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..997085ccc9 100755 --- a/tools/run_tests/build_artifact_node.sh +++ b/tools/run_tests/build_artifact_node.sh @@ -40,9 +40,10 @@ 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 ) +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 ) for version in ${node_versions[@]} do 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 |