CI - improve

.gitlab-ci.yml

@@ -33,24 +33,18 @@ deploy:
   script:
     - cd dist
     - |
-      sshpass -p "$PASSWORD" rsync -avz --delete -O \
-        --exclude 'accounts/' \
-        --exclude 'cache/' \
-        --exclude 'sessions/' \
-        -e "ssh -p 2244 -o StrictHostKeyChecking=no" \
-        site/ $USERNAME@$HOST:$PROD_PATH/site/
+      rsync_deploy() {
+        local src=$1
+        local dst=$2
+        local exclude=$3
+        cmd="sshpass -p \"$PASSWORD\" rsync -az --itemize-changes --delete -O"
+        [[ -n $exclude ]] && cmd="$cmd $exclude"
+        cmd="$cmd -e 'ssh -p 2244 -o StrictHostKeyChecking=no' $src $USERNAME@$HOST:$dst"
+        echo "$cmd"
+        eval $cmd
+      }
 
-      sshpass -p "$PASSWORD" rsync -avz --delete -O \
-        -e "ssh -p 2244 -o StrictHostKeyChecking=no" \
-        vendor/ $USERNAME@$HOST:$PROD_PATH/vendor/
-
-      sshpass -p "$PASSWORD" rsync -avz --delete -O \
-        -e "ssh -p 2244 -o StrictHostKeyChecking=no" \
-        kirby/ $USERNAME@$HOST:$PROD_PATH/kirby/
-
-      sshpass -p "$PASSWORD" rsync -avz --delete -O \
-        --exclude 'tiles/' \
-        -e "ssh -p 2244 -o StrictHostKeyChecking=no" \
-        assets/ $USERNAME@$HOST:$PROD_PATH/assets/
-  dependencies:
-    - build
+      rsync_deploy site/ "$PROD_PATH/site/" "--exclude 'accounts/' --exclude 'cache/' --exclude 'sessions/'"
+      rsync_deploy vendor/ "$PROD_PATH/vendor/"
+      rsync_deploy kirby/ "$PROD_PATH/kirby/"
+      rsync_deploy assets/ "$PROD_PATH/assets/" "--exclude 'tiles/'"