From 07f06cbc9c351d264e1d2f9fe5e4705a9aa6de53 Mon Sep 17 00:00:00 2001 From: Adrien Bourmault Date: Sun, 14 Aug 2022 11:01:39 +0000 Subject: [PATCH] Update .gitlab-ci.yml file --- .gitlab-ci.yml | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 516e532..64b0696 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -21,15 +21,19 @@ synchro-et-tests: stage: build script: - |+ - # Sync files + # Sync files with server rsync -avzlh * /home/webmaster/site-a-lec.org/articles/ - |+ # Check how many changed echo "Fichiers commités : $(git diff-tree --no-commit-id --name-only -r $CI_COMMIT_SHA)" files="" - files=$(git diff-tree --no-commit-id --name-only -r $CI_COMMIT_SHA | grep stl || find . -name "*.stl") - if [ -z "$CI_COMMIT_SHA" ]; then files=$(find . -name "*.stl"); fi + if [ -z "$CI_COMMIT_SHA" ]; then + files=$(find . -name "*.stl" -printf %P) + else + files=$(git diff-tree --no-commit-id --name-only -r $CI_COMMIT_SHA | grep stl || find . -name "*.stl" -printf %P) + fi echo -e "Test de : \n $files" + - cd /home/webmaster/site-a-lec.org - |+ # Test for errors @@ -55,11 +59,15 @@ deploiement: # This job runs in the deploy stage. stage: deploy # It only runs when *both* jobs in the test stage complete successfully. script: - |+ - # Check how many files to be builded + # Check how many changed echo "Fichiers commités : $(git diff-tree --no-commit-id --name-only -r $CI_COMMIT_SHA)" files="" - files=$(git diff-tree --no-commit-id --name-only -r $CI_COMMIT_SHA | grep stl || find . -name "*.stl") - if [ -z "$CI_COMMIT_SHA" ]; then files=$(find . -name "*.stl"); fi + if [ -z "$CI_COMMIT_SHA" ] ; then + files=$(find . -name "*.stl" -printf %P) + else + files=$(git diff-tree --no-commit-id --name-only -r $CI_COMMIT_SHA | grep stl || find . -name "*.stl" -printf %P) + fi + echo -e "Test de : \n $files" - cd /home/webmaster/site-a-lec.org - |+ # Build and check for errors