From 791c47938b9949634b75322fa9905625b391144f Mon Sep 17 00:00:00 2001 From: Martin Quinson Date: Thu, 5 Mar 2020 12:08:39 +0100 Subject: [PATCH] gitlab-ci: 'pages' waits only for 'ctest' again: 'pip' builds its stuff to some weird location Not a raw revert of the previous change because it still uses needs: instead of dependencies: --- .gitlab-ci.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 380224c670..ae5ebb7d2a 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -11,7 +11,11 @@ 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 + release: stage: build only: @@ -45,11 +49,7 @@ pip: - 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: @@ -69,5 +69,5 @@ pages: - public only: - master - needs: ["pip"] + needs: ["ctest"] -- 2.20.1