From 1fd38d778608619abc286d2502d72650ae2c8759 Mon Sep 17 00:00:00 2001
From: Andre Anjos <andre.dos.anjos@gmail.com>
Date: Thu, 10 Jan 2019 12:48:20 +0100
Subject: [PATCH] [ci] Fix conda cache merge
---
ci/bootstrap.sh | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/ci/bootstrap.sh b/ci/bootstrap.sh
index 106e490c..29f77fcc 100755
--- a/ci/bootstrap.sh
+++ b/ci/bootstrap.sh
@@ -53,8 +53,8 @@ check_defined() {
# $2: Path to the extra cache to be merged into main cache
merge_conda_cache() {
if [ -e ${1} ]; then
- _cached_urlstxt="${2}/urls.txt"
- _urlstxt="${1}/urls.txt"
+ _cached_urlstxt="${2}/pkgs/urls.txt"
+ _urlstxt="${1}/pkgs/urls.txt"
if [ -e ${2}/pkgs ]; then
log_info "Merging urls.txt and packages with cached files..."
mv ${2}/pkgs/*.tar.bz2 ${1}/pkgs
--
GitLab