Merge branch 'master' of gitlab.com:pamhyr/pamhyr2

.gitlab-ci.yml

@@ -214,6 +214,24 @@ build-td:
       - doc/users/TP_Hydraulique_Hogneau/Tuto-2-fr.pdf
       - doc/users/TP_Hydraulique_Hogneau/data/
   allow_failure: true
+  
+build-td-2:
+  stage: build
+  tags:
+    - linux
+  needs:
+    - job: set-version
+      artifacts: true
+  script:
+    - cd ./doc/users/TP_AdisTS_Vieux_Rhone/
+    - ./build.sh
+  artifacts:
+    paths:
+      - doc/users/TP_AdisTS_Vieux_Rhone/pas-a-pas.pdf
+      - doc/users/TP_AdisTS_Vieux_Rhone/data/
+      - doc/users/TP_AdisTS_Vieux_Rhone/Sujet.pdf
+      - doc/users/TP_AdisTS_Vieux_Rhone/Vieux_Rhone_TP_AdisTS.pamhyr
+  allow_failure: true
 
 build-developers-doc:
   stage: build
@@ -269,6 +287,8 @@ build-linux:
     #   artifacts: true
     - job: build-td
       artifacts: true
+    - job: build-td-2
+      artifacts: true
   script:
     - mkdir -p linux
     - cd linux
@@ -336,6 +356,11 @@ build-linux:
     - cp ../doc/users/TP_Hydraulique_Hogneau/Tuto-2-fr.pdf pamhyr/doc/TP_Hydraulique_Hogneau/Tuto2-fr.pdf
     - cp ../doc/users/TP_Hydraulique_Hogneau/*.pamhyr pamhyr/doc/TP_Hydraulique_Hogneau/
     - cp ../doc/users/TP_Hydraulique_Hogneau/data/* pamhyr/doc/TP_Hydraulique_Hogneau/data/
+    - mkdir -p pamhyr/doc/TP_AdisTS_Vieux_Rhone/
+    - mkdir -p pamhyr/doc/TP_AdisTS_Vieux_Rhone/data
+    - cp ../doc/users/TP_AdisTS_Vieux_Rhone/*.pdf pamhyr/doc/TP_AdisTS_Vieux_Rhone/
+    - cp ../doc/users/TP_AdisTS_Vieux_Rhone/data/* pamhyr/doc/TP_AdisTS_Vieux_Rhone/data/
+    - cp ../doc/users/TP_AdisTS_Vieux_Rhone/Vieux_Rhone_TP_AdisTS.pamhyr pamhyr/doc/TP_AdisTS_Vieux_Rhone/Vieux_Rhone_TP_AdisTS.pamhyr
     # Copy TP charriage
     - mkdir -p pamhyr/doc/TP_charriage/
     - cp ../doc/users/TP_charriage/* pamhyr/doc/TP_charriage
@@ -366,6 +391,8 @@ build-windows:
     #   artifacts: true
     - job: build-td
       artifacts: true
+    - job: build-td-2
+      artifacts: true
   script:
     - mkdir windows
     - cd windows