diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index e9fed03..752b64e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -31,16 +31,15 @@ synchro-et-tests: do echo "Test de $file" stl log clean - stl check $file | grep Err && errors=$((errors+1)) # error if err is read in standard output - stl check $file | grep "erreur de" && errors=$((errors+1)) # error if err is read in standard output + stl check $file | grep -e "Err" -e "erreur de" -e "Aucun fichier" && errors=$((errors+1)) # error if err is read in standard output done [ $errors -gt 0 ] && false for file in $files do echo "Test supplémentaire de $file" stl log clean - stl check $file -F &> /dev/null - stl check $file -F &> /dev/null + stl check -F $file &> /dev/null + stl check -F $file &> /dev/null done - echo "Fin des tests." @@ -58,9 +57,7 @@ deploiement: # This job runs in the deploy stage. do echo "Construction de $file" stl log clean - stl wip $file | grep Err && errors=$((errors+1)) # error if err is read in standard output - stl wip $file | grep "erreur de" && errors=$((errors+1)) # error if err is read in standard output - stl wip $file | grep "Aucun fichier" && errors=$((errors+1)) # error if err is read in standard output + stl wip -F $file | grep -e "Err" -e "erreur de" -e "Aucun fichier" && errors=$((errors+1)) # error if err is read in standard output done [ $errors -gt 0 ] && false - echo "Déploiement terminé."