From 38a056b3601f14393cb72d739038a69e3e8d11d1 Mon Sep 17 00:00:00 2001
From: Andre Anjos <andre.dos.anjos@gmail.com>
Date: Fri, 14 Dec 2018 14:13:58 +0100
Subject: [PATCH] Revert "[ci] Set relative path to artifacts and cache"
This reverts commit f21fc8ccdc34ade3be62c8bb1d846cf24e2e9f86.
---
.gitlab-ci.yml | 13 ++++++-------
1 file changed, 6 insertions(+), 7 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 01a9235..e4c0e14 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:
--
GitLab