X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/383865f2aac78c3e967e409d603580bde99f917d..4d9001cb9e77f3001a9fe06b506e7eed79156366:/.gitlab-ci.yml

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 6e2412047f..f0d341e0d6 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -16,16 +16,6 @@ ctest:
     - 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
   only:
@@ -35,34 +25,46 @@ release:
   # 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
+  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
+
 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
+  - cd docs/source/_ext/javasphinx; python3 setup.py build; python3 setup.py install
+  - cd ../../..
   - LC_ALL=C.UTF-8 ./Build.sh
   - mv build/html ../public
   # - The CSS contains a reference to a font or something, not something we gonna fix on our side
   # - The javasphinx output does not exist in the git, so the "edit on FramaGit" link is broken.
   #   I'd like to report this as a bug, but javasphinx seems abandonned upstream.
-  - linkchecker --ignore-url='.*\.css$' --ignore-url=public/java/org ../public
+#not installed   - linkchecker --ignore-url='.*\.css$' --ignore-url=public/java/org ../public
   # From time to time, we should check external links with the
   # following, but it has a lot of false positive
   # - linkchecker --ignore-url='.*\.css$' --ignore-url=public/java/org --check-extern ../public
@@ -71,6 +73,4 @@ pages:
     - public
   only:
   - master
-  dependencies:
-  - ctest
-  
+  needs: ["ctest"]