From ca953007edaf4ab2f19ee0a3576180094cc71490 Mon Sep 17 00:00:00 2001
From: Sebastian Pisula <sebastian.pisula@gmail.com>
Date: Mon, 10 Feb 2025 12:20:00 +0100
Subject: [PATCH] feature(core): gitlab changes

---
 gitlab-ci.yml | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/gitlab-ci.yml b/gitlab-ci.yml
index 2b6a74d..3fc4274 100644
--- a/gitlab-ci.yml
+++ b/gitlab-ci.yml
@@ -18,9 +18,9 @@ variables:
 
 stages:
   - build
+  - tests
   - deploy
   - purge_cache
-  - tests
 
 .template: &prepare-assets
   tags:
@@ -58,8 +58,10 @@ stages:
     - ls -al
     - ssh-keyscan -H -p $DEPLOY_PORT $DEPLOY_HOST >> ~/.ssh/known_hosts
     - export RSYNC_RSH="ssh -p $DEPLOY_PORT -v -i ~/.ssh/id_rsa_demo_fs"
-    - rsync -v --delete -rlDe "$RSYNC_RSH" --exclude-from=.distignore ${CI_PROJECT_DIR}/web/ $DEPLOY_USER@$DEPLOY_HOST:$DEPLOY_DIR
-    - ssh -p $DEPLOY_PORT -i ~/.ssh/id_rsa_demo_fs $DEPLOY_USER@$DEPLOY_HOST "cd $DEPLOY_DIR && mv frontend/dist/assets/ public/ && mv frontend/dist/index.html public/index.html && php bin/console doctrine:migrations:migrate --no-interaction && php bin/console cache:clear && $RUN_AFTER_DEPLOY"
+    - rsync -v --delete -rlDe "$RSYNC_RSH" --exclude-from=web/backend/.distignore ${CI_PROJECT_DIR}/web/backend/ $DEPLOY_USER@$DEPLOY_HOST:$DEPLOY_DIR
+    - rsync -v --delete -rlDe "$RSYNC_RSH" --exclude-from=web/frontend/.distignore ${CI_PROJECT_DIR}/web/frontend/dist/ $DEPLOY_USER@$DEPLOY_HOST:$DEPLOY_DIR/public
+
+  #    - ssh -p $DEPLOY_PORT -i ~/.ssh/id_rsa_demo_fs $DEPLOY_USER@$DEPLOY_HOST "cd $DEPLOY_DIR && mv frontend/dist/assets/ public/ && mv frontend/dist/index.html public/index.html && php bin/console doctrine:migrations:migrate --no-interaction && php bin/console cache:clear && $RUN_AFTER_DEPLOY"
   after_script:
     - $DEPLOY_AFTER_SCRIPT
 
-- 
GitLab