From ac66a1c5eb578d4215b7aa9c8415afc7b23f18f1 Mon Sep 17 00:00:00 2001
From: Ilya Rassadin <elcamlost@gmail.com>
Date: Mon, 26 Nov 2018 19:47:57 +0300
Subject: [PATCH] use gitlab-ci-template.yml to lint ci

---
 .deploy_code_to_server.yml |  3 ++-
 gitlab-ci-template.yml     | 13 ++++++++-----
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/.deploy_code_to_server.yml b/.deploy_code_to_server.yml
index 7f38e52..523d097 100644
--- a/.deploy_code_to_server.yml
+++ b/.deploy_code_to_server.yml
@@ -20,12 +20,13 @@
   echo $PROJECT_FILTER
 
 .deploy_code_to_server_with_delete:
+  variables:
+    RSYNC_PARAMS: "--delete --dry-run"
   extends: .before_deploy_code
   script:
     - 'which curl || (apt-get update -y && apt-get install curl -y)'
     - curl -O https://gitlab.cetera.ru/boilerplate/ci/raw/ci-delete/rsync-filter-std
     - *set_rsync_filter
-    - export RSYNC_PARAMS="--delete --dry-run"
     - rsync -avz --chown=33:33 --numeric-ids -e "ssh -o StrictHostKeyChecking=no -o IdentitiesOnly=yes -i $HOME/.ssh/deploy.key " --filter="merge rsync-filter-std" --filter="merge $PROJECT_FILTER" $RSYNC_PARAMS $CI_PROJECT_DIR/ root@${!PROJECT_SERVER}::www/${!PROJECT_SITE}/
   only:
     refs:
diff --git a/gitlab-ci-template.yml b/gitlab-ci-template.yml
index 30f5912..5124346 100644
--- a/gitlab-ci-template.yml
+++ b/gitlab-ci-template.yml
@@ -7,17 +7,20 @@ include:
   - 'https://gitlab.cetera.ru/boilerplate/ci/raw/master/.deploy_code_to_server.yml'
   - 'https://gitlab.cetera.ru/boilerplate/ci/raw/master/.deploy_composer_files_to_server.yml'
 
-.build_assets:
+build_assets:
   extends: .build_assets
 
-.build_composer:
+build_composer:
   extends: .build_composer
 
-.deploy_assets_to_staging:
+deploy_assets_to_staging:
   extends: .deploy_assets_to_staging
 
-.deploy_code_to_server:
+deploy_code_to_server:
   extends: .deploy_code_to_server
+
+deploy_code_to_server_with_delete:
+  extends: .deploy_code_to_server_with_delete
   
-.deploy_composer_files_to_server:
+deploy_composer_files_to_server:
   extends: .deploy_composer_files_to_server
-- 
GitLab