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: ...@@ -33,23 +33,22 @@ stages:
- ${CONDA_ROOT}/pkgs/urls.txt - ${CONDA_ROOT}/pkgs/urls.txt
.build_linux_template: &linux_build_job .build_macosx_template: &macosx_build_job
<<: *build_job <<: *build_job
tags: tags:
- docker - macosx
image: continuumio/conda-concourse-ci
artifacts: artifacts:
expire_in: 1 week expire_in: 1 week
paths: paths:
- _ci/ - _ci/
- ${CONDA_ROOT}/conda-bld/linux-64/*.tar.bz2 - ${CONDA_ROOT}/conda-bld/osx-64/*.tar.bz2
cache: cache:
<<: *build_caches <<: *build_caches
key: "linux-cache" key: "macosx-cache"
build_linux_36: build_macosx_36:
<<: *linux_build_job <<: *macosx_build_job
variables: variables:
GITLAB_CHECKOUT_STRATEGY: "https://gitlab-ci-token:${CI_BUILD_TOKEN}@gitlab.idiap.ch/" GITLAB_CHECKOUT_STRATEGY: "https://gitlab-ci-token:${CI_BUILD_TOKEN}@gitlab.idiap.ch/"
PYTHON_VERSION: "3.6" PYTHON_VERSION: "3.6"
...@@ -59,7 +58,7 @@ build_linux_36: ...@@ -59,7 +58,7 @@ build_linux_36:
paths: paths:
- _ci/ - _ci/
- sphinx - sphinx
- ${CONDA_ROOT}/conda-bld/linux-64/*.tar.bz2 - ${CONDA_ROOT}/conda-bld/osx-64/*.tar.bz2
# Deploy targets # Deploy targets
...@@ -70,7 +69,7 @@ build_linux_36: ...@@ -70,7 +69,7 @@ build_linux_36:
script: script:
- ./_ci/deploy.sh - ./_ci/deploy.sh
dependencies: dependencies:
- build_linux_36 - build_macosx_36
tags: tags:
- deployer - deployer
...@@ -89,4 +88,4 @@ deploy_stable: ...@@ -89,4 +88,4 @@ deploy_stable:
only: only:
- /^v\d+\.\d+\.\d+([abc]\d*)?$/ # PEP-440 compliant version (tags) - /^v\d+\.\d+\.\d+([abc]\d*)?$/ # PEP-440 compliant version (tags)
except: 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