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

.gitlab-ci.yml

@@ -17,22 +17,19 @@ stages:          # List of stages for jobs, and their order of execution
   - build
   - deploy
 
-build-job:
+synchro-et-tests:
   stage: build
   script:
-    - echo "Récupération du dernier git push..."
+    - rsync -avzlh * /home/webmaster/articles/
+    - rsync -avzlh fichiers/ /var/lib/gsl/domains/chalec.org/files/
+    - rsync -avzlh images/ /var/lib/gsl/domains/chalec.org/images/
     - cd /home/webmaster/articles
-    - git checkout -- . 
-    - git pull
-    - rsync -avzlh --ignore-existing fichiers/ /var/lib/gsl/domains/chalec.org/files/
-    - rsync -avzlh --ignore-existing images/ /var/lib/gsl/domains/chalec.org/images/
     - gsl check
 
 
-deploy-job:      # This job runs in the deploy stage.
+deploiement:      # This job runs in the deploy stage.
   stage: deploy  # It only runs when *both* jobs in the test stage complete successfully.
   script:
-    - echo "Déploiement..."
     - cd /home/webmaster/articles
     - |+
       for postfile in $(ls *.gsl)
@@ -40,4 +37,4 @@ deploy-job:      # This job runs in the deploy stage.
         echo "Construction de $postfile"
         gsl check $postfile && gsl make $postfile &&  gsl check $postfile && gsl make $postfile
       done
-    - echo "Déploiement terminé."
+    - echo "Déploiement terminé."