diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 01a92350b5230b6a5c7d99eaa9011072252be541..e4c0e1472456b1a82fd11720543d0570c1bef660 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -3,8 +3,7 @@ # Definition of global variables (all stages) variables: - MINICONDA_DIR: "miniconda" - CONDA_ROOT: "${CI_PROJECT_DIR}/${MINICONDA_DIR}" + CONDA_ROOT: "${CI_PROJECT_DIR}/miniconda" # Definition of our build pipeline order @@ -30,8 +29,8 @@ stages: cache: &build_caches paths: - miniconda.sh - - ${MINICONDA_DIR}/pkgs/*.tar.bz2 - - ${MINICONDA_DIR}/pkgs/urls.txt + - ${CONDA_ROOT}/pkgs/*.tar.bz2 + - ${CONDA_ROOT}/pkgs/urls.txt .build_linux_template: &linux_build_job @@ -43,7 +42,7 @@ stages: expire_in: 1 week paths: - _ci/ - - ${MINICONDA_DIR}/conda-bld/linux-64/*.tar.bz2 + - ${CONDA_ROOT}/conda-bld/linux-64/*.tar.bz2 cache: <<: *build_caches key: "linux-cache" @@ -57,7 +56,7 @@ stages: expire_in: 1 week paths: - _ci/ - - ${MINICONDA_DIR}/conda-bld/osx-64/*.tar.bz2 + - ${CONDA_ROOT}/conda-bld/osx-64/*.tar.bz2 cache: <<: *build_caches key: "macosx-cache" @@ -74,7 +73,7 @@ build_linux_36: - _ci/ - dist/*.zip - sphinx - - ${MINICONDA_DIR}/conda-bld/linux-64/*.tar.bz2 + - ${CONDA_ROOT}/conda-bld/linux-64/*.tar.bz2 build_macosx_36: