Merge pull request #7405 from opf/housekeeping/optional-cache-fixing

Circumvent travis cache bug with ENV RECOMPILE_ON_TRAVIS_CACHE_ERROR

[ci skip]

script/ci/setup.sh

@@ -68,7 +68,12 @@ if [ $1 = 'units' ]; then
 fi
 
 if [ ! -f "public/assets/frontend_assets.manifest.json" ]; then
+  if [ -z "${RECOMPILE_ON_TRAVIS_CACHE_ERROR}" ]; then
+    echo "ERROR: asset manifest was not properly cached. exiting"
+    exit 1
+  else
     run "bash $(dirname $0)/cache_prepare.sh"
   fi
+fi
 
 run "cp -rp public/assets/frontend_assets.manifest.json config/frontend_assets.manifest.json"