Merge branch 's_SimGrid_simgrid' into 'master'

[simgrid.git] / .gitlab-ci.yml

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ce05b23..eacd58d 100644 (file)
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -32,7 +32,7 @@ ctest:
   - stable
   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 --output-on-failure
+  - make -j$(nproc) VERBOSE=1 all tests && ctest -j$(nproc) --output-on-failure
 
 pip:
   image: debian:testing
@@ -56,14 +56,14 @@ release:
   # Get the foreign architectures
   - wget https://ci.appveyor.com/api/projects/mquinson/simgrid/artifacts/simgrid.jar -O simgrid-windows.jar
   - export SGVER=`printf '#include "simgrid/config.h"\n#if SIMGRID_VERSION_PATCH\nSIMGRID_VERSION_MAJOR.SIMGRID_VERSION_MINOR.SIMGRID_VERSION_PATCH\n#else\nSIMGRID_VERSION_MAJOR.SIMGRID_VERSION_MINOR\n#endif'|gcc -E - -Iinclude|tail -1|sed 's/ //g'`
-  - wget https://ci.inria.fr/simgrid/job/SimGrid/build_mode=Debug,node=osx/lastSuccessfulBuild/artifact/build/SimGrid-${SGVER}/build/simgrid.jar -O simgrid-mac.jar
+  - wget https://ci.inria.fr/simgrid/job/SimGrid/build_mode=Debug,node=osx/lastSuccessfulBuild/artifact/build/simgrid-${SGVER}/build/simgrid.jar -O simgrid-mac.jar
   # Open all jar files, and strip them
   - mkdir content ; cd content
   - for j in  ../simgrid.jar ../simgrid-windows.jar ../simgrid-mac.jar ; do unzip -n $j ; done
   - strip NATIVE/*/*/*.so
   - x86_64-linux-gnu-strip NATIVE/*/*/lib*dll
-  - zip -r ../SimGrid-${SGVER}.jar *
+  - zip -r ../simgrid-${SGVER}.jar *
   artifacts:
     paths:
-    - SimGrid-*.jar
-    - SimGrid-*.tar.gz
+    - simgrid-*.jar
+    - simgrid-*.tar.gz