Merge branch 'master' of git.a-lec.org:a-lec/commissions/chalec/www

.gitlab-ci.yml

@@ -21,35 +21,35 @@ synchro-et-tests:
   stage: build
   script:
     - rsync -avzlh * /home/webmaster/site-chalec.org/articles/
-    - files=$(git diff-tree --no-commit-id --name-only -r $CI_COMMIT_SHA|grep stl || ls *.stl)
+    - |+
+      files=""
+      files=$(git diff-tree --no-commit-id --name-only -r $CI_COMMIT_SHA | grep stl || ls *.stl)
     - cd /home/webmaster/site-chalec.org
     - |+
-      errors=
+      errors=0
       for file in $files
       do
         echo "Test de $file"
-        stl check $file
-        errors=$errors"\n"$(stl check $file | grep Err) # return false if error is read in standard output
+        stl check $file | grep Err && errors=$((errors+1)) # error if err is read in standard output
       done
-      echo "Récapitulatif des erreurs"
-      echo -e $errors | grep Err && false
+      [ $errors -gt 0 ] && false
     - echo "Fin des tests."
 
 
 deploiement:      # This job runs in the deploy stage.
   stage: deploy  # It only runs when *both* jobs in the test stage complete successfully.
   script:
-    - files=$(git diff-tree --no-commit-id --name-only -r $CI_COMMIT_SHA|grep stl || ls *.stl)
+    - |+
+      files=""
+      files=$(git diff-tree --no-commit-id --name-only -r $CI_COMMIT_SHA | grep stl || ls *.stl)
     - cd /home/webmaster/site-chalec.org
     - |+
-      errors=
+      errors=""
       for file in $files
       do
         echo "Construction de $file"
-        stl wip $file
-        errors=$errors"\n"$(stl wip $file | grep Err) # return false if error is read in standard output
+        stl wip $file | grep Err && errors=$((errors+1)) # error if err is read in standard output
       done
-      echo "Récapitulatif des erreurs"
-      echo -e $errors | grep Err && false
+      [ $errors -gt 0 ] && false
     - stl sync
     - echo "Déploiement terminé."