Skip to content

A peer-to-peer stack for code collaboration

Always create new cache file when remote is missing

Thomas Scholtesff260218d3b3
diff --git a/scripts/ci.sh b/scripts/ci.sh
index a5b5c8f..3caddb2 100755
--- a/scripts/ci.sh
+++ b/scripts/ci.sh
@@ -11,31 +11,30 @@ remote_cache_master="$remote/stack-root-master.tar.gz"
remote_cache_hashed="$remote/stack-root-${dependency_hash}.tar.gz"
function load-cache() {
- if gsutil ls "$remote_cache_hashed"; then
+ if gsutil -q ls "$remote_cache_hashed"; then
+ echo "Using hashed stack cache"
gsutil -m cp "$remote_cache_hashed" "$local_cache_archive"
tar xzf "$local_cache_archive"
- elif gsutil ls "$remote_cache_master"; then
+ rm "$local_cache_archive"
+ elif gsutil -q ls "$remote_cache_master"; then
+ echo "Using master stack cache"
gsutil -m cp "$remote_cache_master" "$local_cache_archive"
tar xzf "$local_cache_archive"
+ rm "$local_cache_archive"
fi
}
-function build-cache() {
- if [ ! -f "$local_cache_archive" ]; then
+function save-cache() {
+ if ! gsutil -q ls "$remote_cache_hashed"; then
+ echo "Uploading stack cache"
# This file is not needed and unecessarily large
rm -rf .stack/indices/Hackage/00-index.tar*
-
tar czf $local_cache_archive .stack
- fi
-}
-
-function save-cache() {
- if ! gsutil ls "$remote_cache_hashed"; then
- build-cache
gsutil -m cp $local_cache_archive "$remote_cache_hashed" || true
fi
if [ "$BRANCH_NAME" = "master" ]; then
+ echo "Setting master cache to current cache"
gsutil -m cp "$remote_cache_hashed" "$remote_cache_master" || true
fi
}