From 8b11f16e188308fa08998313b88be4d77b2b8e42 Mon Sep 17 00:00:00 2001 From: Adrien Bourmault Date: Sat, 13 Aug 2022 23:35:56 +0000 Subject: [PATCH 1/3] Update .gitlab-ci.yml file --- .gitlab-ci.yml | 46 ++++++++++++++++++++++++++++++++-------------- 1 file changed, 32 insertions(+), 14 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 3d16eab..0ad52c5 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -20,26 +20,44 @@ stages: # List of stages for jobs, and their order of execution synchro-et-tests: stage: build script: - - rsync -avzlh * /home/webmaster/articles/ --delete - - mkdir -p /var/lib/gsl/domains/a-lec.org/files/ /var/lib/gsl/domains/a-lec.org/images - - rsync -avzlh fichiers/ /var/lib/gsl/domains/a-lec.org/files/ - - rsync -avzlh images/ /var/lib/gsl/domains/a-lec.org/images/ - - files=(git diff-tree --no-commit-id --name-only -r $CI_COMMIT_SHA) - - cd /home/webmaster/articles - - gsl check - - test -z "$(gsl check | grep Err)" - - gsl sync wip + - rsync -avzlh * /home/webmaster/site-a-lec.org/articles/ + - |+ + 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=0 + for file in $files + do + echo "Test de $file" + stl log clean + 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 -F $file &> /dev/null + stl check -F $file &> /dev/null + done + - 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: - - cd /home/webmaster/articles - |+ - for postfile in $(ls *.gsl) + files="" + files=$(git diff-tree --no-commit-id --name-only -r $CI_COMMIT_SHA | grep stl || ls *.stl) + - cd /home/webmaster/site-a-lec.org + - |+ + errors=0 + for file in $files do - echo "Construction de $postfile" - gsl make $postfile - test -z "$(gsl make $postfile | grep Err)" + echo "Construction de $file" + stl log clean + 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é." From 0197f037f5fa0dd4b8d3020def44f68b371f39cf Mon Sep 17 00:00:00 2001 From: Adrien Bourmault Date: Sat, 13 Aug 2022 23:37:11 +0000 Subject: [PATCH 2/3] Update .gitlab-ci.yml file --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 0ad52c5..4a5457c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -24,7 +24,7 @@ synchro-et-tests: - |+ files="" files=$(git diff-tree --no-commit-id --name-only -r $CI_COMMIT_SHA | grep stl || ls *.stl) - - cd /home/webmaster/site-chalec.org + - cd /home/webmaster/site-a-lec.org - |+ errors=0 for file in $files From 72f8aedcd4e714af6423836a706e6dab298cb260 Mon Sep 17 00:00:00 2001 From: Adrien Bourmault Date: Sat, 13 Aug 2022 23:42:15 +0000 Subject: [PATCH 3/3] Delete .gitkeep --- fichiers/.gitkeep | 0 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 fichiers/.gitkeep diff --git a/fichiers/.gitkeep b/fichiers/.gitkeep deleted file mode 100644 index e69de29..0000000