Commit 16d368b5 authored by André Anjos's avatar André Anjos 💬
Browse files

Reduce number of pipeline stages after fix to #51

parent ae298622
...@@ -8,17 +8,15 @@ variables: ...@@ -8,17 +8,15 @@ variables:
# Definition of our build pipeline order # Definition of our build pipeline order
stages: stages:
- build1 - build
- build2 - docker
- docker1
- docker2
- deploy - deploy
- pypi - pypi
# Build targets # Build targets
.build_template: &build_job .build_template: &build_job
stage: build1 stage: build
before_script: before_script:
- mkdir _ci - mkdir _ci
- curl --silent "https://gitlab.idiap.ch/bob/bob.admin/raw/master/gitlab/install.sh" > _ci/install.sh - curl --silent "https://gitlab.idiap.ch/bob/bob.admin/raw/master/gitlab/install.sh" > _ci/install.sh
...@@ -67,7 +65,7 @@ stages: ...@@ -67,7 +65,7 @@ stages:
# Docker host based testing (must be run inside dind or docker-enabled host) # Docker host based testing (must be run inside dind or docker-enabled host)
.docker_test_linux_template: &linux_docker_job .docker_test_linux_template: &linux_docker_job
stage: docker1 stage: docker
before_script: before_script:
# safe keep artifacts as before_build.sh will erase those... # safe keep artifacts as before_build.sh will erase those...
- mv ${CONDA_ROOT}/conda-bld . - mv ${CONDA_ROOT}/conda-bld .
...@@ -110,8 +108,6 @@ build_macosx_27: ...@@ -110,8 +108,6 @@ build_macosx_27:
build_macosx_36: build_macosx_36:
<<: *macosx_build_job <<: *macosx_build_job
stage: build2
dependencies: []
variables: variables:
PYTHON_VERSION: "3.6" PYTHON_VERSION: "3.6"
...@@ -129,7 +125,6 @@ docker_linux_27: ...@@ -129,7 +125,6 @@ docker_linux_27:
docker_linux_36: docker_linux_36:
<<: *linux_docker_job <<: *linux_docker_job
stage: docker2
variables: variables:
PYTHON_VERSION: "3.6" PYTHON_VERSION: "3.6"
dependencies: dependencies:
......
Supports Markdown
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