Skip to content
Snippets Groups Projects
Commit 3badf9d4 authored by André Anjos's avatar André Anjos :speech_balloon:
Browse files

Merge branch 'relative-ci-paths' into 'master'

Revert "[ci] Set relative path to artifacts and cache"

See merge request !34
parents b44fef46 38a056b3
No related branches found
No related tags found
1 merge request!34Revert "[ci] Set relative path to artifacts and cache"
Pipeline #25475 failed
...@@ -3,8 +3,7 @@ ...@@ -3,8 +3,7 @@
# Definition of global variables (all stages) # Definition of global variables (all stages)
variables: variables:
MINICONDA_DIR: "miniconda" CONDA_ROOT: "${CI_PROJECT_DIR}/miniconda"
CONDA_ROOT: "${CI_PROJECT_DIR}/${MINICONDA_DIR}"
# Definition of our build pipeline order # Definition of our build pipeline order
...@@ -30,8 +29,8 @@ stages: ...@@ -30,8 +29,8 @@ stages:
cache: &build_caches cache: &build_caches
paths: paths:
- miniconda.sh - miniconda.sh
- ${MINICONDA_DIR}/pkgs/*.tar.bz2 - ${CONDA_ROOT}/pkgs/*.tar.bz2
- ${MINICONDA_DIR}/pkgs/urls.txt - ${CONDA_ROOT}/pkgs/urls.txt
.build_linux_template: &linux_build_job .build_linux_template: &linux_build_job
...@@ -43,7 +42,7 @@ stages: ...@@ -43,7 +42,7 @@ stages:
expire_in: 1 week expire_in: 1 week
paths: paths:
- _ci/ - _ci/
- ${MINICONDA_DIR}/conda-bld/linux-64/*.tar.bz2 - ${CONDA_ROOT}/conda-bld/linux-64/*.tar.bz2
cache: cache:
<<: *build_caches <<: *build_caches
key: "linux-cache" key: "linux-cache"
...@@ -57,7 +56,7 @@ stages: ...@@ -57,7 +56,7 @@ stages:
expire_in: 1 week expire_in: 1 week
paths: paths:
- _ci/ - _ci/
- ${MINICONDA_DIR}/conda-bld/osx-64/*.tar.bz2 - ${CONDA_ROOT}/conda-bld/osx-64/*.tar.bz2
cache: cache:
<<: *build_caches <<: *build_caches
key: "macosx-cache" key: "macosx-cache"
...@@ -74,7 +73,7 @@ build_linux_36: ...@@ -74,7 +73,7 @@ build_linux_36:
- _ci/ - _ci/
- dist/*.zip - dist/*.zip
- sphinx - sphinx
- ${MINICONDA_DIR}/conda-bld/linux-64/*.tar.bz2 - ${CONDA_ROOT}/conda-bld/linux-64/*.tar.bz2
build_macosx_36: build_macosx_36:
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment