diff --git a/gitlab/build.sh b/gitlab/build.sh index 8ae5502ab083f7f2ab0f1b687274e3944b4df82c..599829d78c3a341ef1fcadeed268fc943124bd24 100755 --- a/gitlab/build.sh +++ b/gitlab/build.sh @@ -30,3 +30,7 @@ fi # Copy the .tar.bz2 and urls.txt merge_conda_cache ${CONDA_ENVS_PATH}/.pkgs ${CONDA_FOLDER}/pkgs +log_info ls ${CONDA_FOLDER}/pkgs +ls ${CONDA_FOLDER}/pkgs +log_info ls ${CONDA_ENVS_PATH}/.pkgs +ls ${CONDA_ENVS_PATH}/.pkgs diff --git a/gitlab/functions.sh b/gitlab/functions.sh index 90c162317b37940fa8b16ec6676f28626fbe85c3..1cdd2a25dad8ddc3a578d7fddc008bc97a7c990b 100644 --- a/gitlab/functions.sh +++ b/gitlab/functions.sh @@ -273,7 +273,7 @@ merge_conda_cache() { _urls="${1}/urls.txt" if [ -e ${2} ]; then log_info "Merging urls.txt and packages with cached files..." - mv -n ${2}/*.tar.bz2 ${1}/ + mv ${2}/*.tar.bz2 ${1}/ cat ${_urls} ${_cached_urls} | sort | uniq > ${_urls} fi fi