From 66f1c621ed4b26107a35520bd26488758c2a3615 Mon Sep 17 00:00:00 2001
From: Martin Quinson <martin.quinson@ens-rennes.fr>
Date: Thu, 5 Mar 2020 11:50:29 +0100
Subject: [PATCH] gitlab-ci: pages only waits for the pip build, to speed
 things up

- This way, the pages can be built before the tests are run
---
 .gitlab-ci.yml | 33 +++++++++++++++------------------
 1 file changed, 15 insertions(+), 18 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 6e2412047f..380224c670 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -11,20 +11,6 @@ ctest:
   script:
   - cmake -Denable_model-checking=OFF -Denable_documentation=OFF -Denable_coverage=OFF -Denable_lua=OFF -Denable_compile_optimizations=ON -Denable_smpi=ON -Denable_smpi_MPICH3_testsuite=ON -Denable_compile_warnings=ON -DLTO_EXTRA_FLAG="auto" .
   - make -j$(nproc) VERBOSE=1 all tests && ctest -j$(nproc) --output-on-failure
-  artifacts:
-    paths:
-    - lib/
-    expire_in: 1 week
-
-pip:
-  image: debian:testing
-  stage: build
-  except:
-  - stable
-  script:
-  - apt-get --allow-releaseinfo-change update && apt install -y python3-pip cmake libboost-dev g++ gcc pybind11-dev
-  - python3 setup.py sdist
-  - cd dist && tar xfz simgrid*.tar.gz && cd simgrid-*/ && python3 setup.py build
 
 release:
   stage: build
@@ -50,11 +36,23 @@ release:
     - simgrid-*.jar
     - simgrid-*.tar.gz
 
+pip:
+  image: debian:testing
+  stage: build
+  except:
+  - stable
+  script:
+  - apt-get --allow-releaseinfo-change update && apt install -y python3-pip cmake libboost-dev g++ gcc pybind11-dev
+  - python3 setup.py sdist
+  - cd dist && tar xfz simgrid*.tar.gz && cd simgrid-*/ && python3 setup.py build
+  artifacts:
+    paths:
+    - lib/
+    expire_in: 1 week
+  
 pages:
   stage: deploy
   script:
-#  - cmake -Denable_model-checking=OFF -Denable_documentation=ON -Denable_compile_optimizations=OFF -Denable_smpi=OFF -Dpython=ON -DLTO_EXTRA_FLAG="auto" .
-#  - make -j$(nproc)
   - pip3 install --requirement docs/requirements.txt
   - cd docs
   - LC_ALL=C.UTF-8 ./Build.sh
@@ -71,6 +69,5 @@ pages:
     - public
   only:
   - master
-  dependencies:
-  - ctest
+  needs: ["pip"]
   
-- 
2.20.1