Commit d922d06b authored by Zohreh MOSTAANI's avatar Zohreh MOSTAANI

Merge branch 'new' of gitlab.idiap.ch:beat/docs into new

parents b6d08d87 021dd070
Pipeline #24805 passed with stages
in 9 minutes and 52 seconds
......@@ -33,23 +33,22 @@ stages:
- ${CONDA_ROOT}/pkgs/urls.txt
.build_linux_template: &linux_build_job
.build_macosx_template: &macosx_build_job
<<: *build_job
tags:
- docker
image: continuumio/conda-concourse-ci
- macosx
artifacts:
expire_in: 1 week
paths:
- _ci/
- ${CONDA_ROOT}/conda-bld/linux-64/*.tar.bz2
- ${CONDA_ROOT}/conda-bld/osx-64/*.tar.bz2
cache:
<<: *build_caches
key: "linux-cache"
key: "macosx-cache"
build_linux_36:
<<: *linux_build_job
build_macosx_36:
<<: *macosx_build_job
variables:
GITLAB_CHECKOUT_STRATEGY: "https://gitlab-ci-token:${CI_BUILD_TOKEN}@gitlab.idiap.ch/"
PYTHON_VERSION: "3.6"
......@@ -59,7 +58,7 @@ build_linux_36:
paths:
- _ci/
- sphinx
- ${CONDA_ROOT}/conda-bld/linux-64/*.tar.bz2
- ${CONDA_ROOT}/conda-bld/osx-64/*.tar.bz2
# Deploy targets
......@@ -70,7 +69,7 @@ build_linux_36:
script:
- ./_ci/deploy.sh
dependencies:
- build_linux_36
- build_macosx_36
tags:
- deployer
......@@ -89,4 +88,4 @@ deploy_stable:
only:
- /^v\d+\.\d+\.\d+([abc]\d*)?$/ # PEP-440 compliant version (tags)
except:
- branches
- branches
\ No newline at end of file
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment