Be more conservative to what we cache

parent 7cf8712d
...@@ -20,7 +20,7 @@ CACHE_DIR=$2 ...@@ -20,7 +20,7 @@ CACHE_DIR=$2
ENV_DIR=$3 ENV_DIR=$3
CACHED_DIRS=".heroku" CACHE_ENTRIES=".heroku/python .heroku/python-stack .heroku/python-version"
# Static configurations for virtualenv caches. # Static configurations for virtualenv caches.
VIRTUALENV_LOC=".heroku/venv" VIRTUALENV_LOC=".heroku/venv"
...@@ -145,8 +145,9 @@ bpwatch stop clear_old_venvs ...@@ -145,8 +145,9 @@ bpwatch stop clear_old_venvs
# Restore old artifacts from the cache. # Restore old artifacts from the cache.
bpwatch start restore_cache bpwatch start restore_cache
for dir in $CACHED_DIRS; do for dir in $CACHE_ENTRIES; do
cp -R $CACHE_DIR/$dir . &> /dev/null || true mkdir -p $(basename $dir)
cp -R $CACHE_DIR/$dir $dir &> /dev/null || true
done done
bpwatch stop restore_cache bpwatch stop restore_cache
...@@ -209,9 +210,10 @@ bpwatch stop post_compile ...@@ -209,9 +210,10 @@ bpwatch stop post_compile
# Store new artifacts in cache. # Store new artifacts in cache.
bpwatch start dump_cache bpwatch start dump_cache
for dir in $CACHED_DIRS; do for dir in $CACHE_ENTRIES; do
rm -rf $CACHE_DIR/$dir rm -rf $CACHE_DIR/$dir
cp -R $dir $CACHE_DIR/ mkdir -p $(dirname $CACHE_DIR/$dir)
cp -R $dir $CACHE_DIR/$dir
done done
bpwatch stop dump_cache bpwatch stop dump_cache
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment