X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/ef0727208d3b76f0c883f2377e7ccb42f480d4b9..aea3ef1979beaf6ac6f3060e8f99563735e413ed:/.gitlab-ci.yml

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index fc9bff366d..cb45b58b17 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -9,46 +9,65 @@ ctest:
   except:
   - 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 -j$(nproc) --output-on-failure
+  - apt-get --allow-releaseinfo-change update
+  - apt install -y xsltproc
+  - cmake -Denable_model-checking=OFF -Denable_documentation=OFF -Denable_coverage=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 -T Test -j$(nproc) --output-on-failure
+  - xsltproc ./tools/jenkins/ctest2junit.xsl Testing/"$( head -n 1 < Testing/TAG )"/Test.xml > CTestResults.xml
   artifacts:
     paths:
     - lib/
+    reports:
+      junit:
+      - CTestResults.xml
     expire_in: 1 week
-  
+    when: always
+
+
 release:
   stage: build
   only:
   - stable
   script:
-  - apt-get --allow-releaseinfo-change update && apt install -y binutils-x86-64-linux-gnu wget unzip zip
+  - apt-get --allow-releaseinfo-change update
+  - apt install -y binutils-x86-64-linux-gnu wget unzip zip
   # Build the linux version of the jarfile without the boost dependency
   - cmake -Denable_documentation=OFF -Denable_java=ON -Denable_msg=ON -Denable_lib_in_jar=ON -Dminimal-bindings=ON -Denable_compile_optimizations=ON -Denable_smpi=OFF -DLTO_EXTRA_FLAG="auto" .
   - make VERBOSE=1 -j$(nproc) dist simgrid simgrid-java_jar
-  # 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
-  # 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 *
+# This cannot work anymore because Java is now built by the modelchecker jenkins configuration, that is not on macosx
+# Please use the github action instead
+#  - make VERBOSE=1 -j$(nproc) dist simgrid simgrid-java_jar
+#  # Get the foreign architectures
+#  - wget https://ci.appveyor.com/api/projects/mquinson/simgrid/artifacts/simgrid.jar -O simgrid-windows.jar
+#  - export SGVER=`grep SimGrid ChangeLog|head -n1|sed -e 's/SimGrid (//' -e 's/).*//'`
+#  - wget https://ci.inria.fr/simgrid/job/SimGrid/build_mode=Debug,node=macos/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 *
   artifacts:
     paths:
-    - simgrid-*.jar
+#    - simgrid-*.jar
     - simgrid-*.tar.gz
 
 pip:
-  image: debian:testing
+  image:
+    name: python:3-bullseye
+    entrypoint: ['/bin/bash', '-c', 'ln -snf /bin/bash /bin/sh && /bin/bash -c $0' ]
   stage: build
   except:
   - stable
   script:
-  - apt-get --allow-releaseinfo-change update && apt install -y python3-pip cmake libboost-dev g++ gcc pybind11-dev
+  - 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
+  - cd dist
+  - tar xfz simgrid*.tar.gz
+  - cd simgrid-*/
+  - python3 setup.py build
 
 pages:
   stage: deploy
@@ -71,4 +90,3 @@ pages:
   only:
   - master
   needs: ["ctest"]
-