Reduce number of pipeline stages after fix to #51

.gitlab-ci.yml

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