Merge branch 'master' into changelog

.travis.yml

@@ -2,5 +2,8 @@ language: bash
 sudo: required
 services:
   - docker
-install: docker pull heroku/cedar:14
-script: make test
+env:
+  - STACK=heroku-16
+  - STACK=cedar-14
+install: docker pull "heroku/${STACK/-/:}"
+script: make test-${STACK}

CHANGELOG.md

@@ -2,6 +2,9 @@
 
 ## Master
 
+- Add `$STACK` to the cache signature (#445)
+- Log output now differentiates between an empty cache and a new cache signature
+
 ## v107 (2017-07-17)
 
 - Switch to using nodebin to download the yarn binary (#444)

lib/cache.sh

 source $BP_DIR/lib/binaries.sh
 
 create_signature() {
-  echo "$(node --version); $(npm --version); $(yarn --version 2>/dev/null || true) $PREBUILD"
+  echo "${STACK}; $(node --version); $(npm --version); $(yarn --version 2>/dev/null || true); ${PREBUILD}"
 }
 
 save_signature() {
@@ -19,6 +19,8 @@ load_signature() {
 get_cache_status() {
   if ! ${NODE_MODULES_CACHE:-true}; then
     echo "disabled"
+  elif ! test -d "${CACHE_DIR}/node/"; then
+    echo "not-found"
   elif [ "$(create_signature)" != "$(load_signature)" ]; then
     echo "new-signature"
   else

test/run

@@ -54,12 +54,13 @@ testBuildWithCache() {
   cache=$(mktmpdir)
 
   compile "stable-node" $cache
-  assertCaptured "Skipping cache restore (new-signature"
+  assertCaptured "Skipping cache restore (not-found)"
   assertEquals "1" "$(ls -1 $cache/node/node_modules | grep hashish | wc -l | tr -d ' ')"
   assertCapturedSuccess
 
   compile "stable-node" $cache
   assertNotCaptured "- node_modules (not cached - skipping)"
+  assertFileContains "${STACK}" "${cache}/node/signature"
   assertCapturedSuccess
 
   rm -rf "$cache/node/node_modules"