From 04dde45bd594af9493fac9975122522ccfb05d4d Mon Sep 17 00:00:00 2001
From: Fazle Rabbi <fazlerabbi37@e.email>
Date: Tue, 24 May 2022 11:26:32 +0600
Subject: [PATCH 1/4] add job deploy with remote template

---
 .gitlab-ci.yml | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100644 .gitlab-ci.yml

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
new file mode 100644
index 00000000..c9a8b0b8
--- /dev/null
+++ b/.gitlab-ci.yml
@@ -0,0 +1,15 @@
+variables:
+  NC_APP_NAME: ecloud_drop_account
+include:
+    - project: 'e/infra/ecloud/nextcloud-apps/ci-templates'
+      ref: dev/template
+      file: 'auto-deploy-pipelines.yml'
+
+.deploy:nextcloud-app:
+    stage: deploy
+    script:
+      # overriding script as all it needs is clone, copy and chown
+      # print var to confirm
+      - echo "Deploying $CI_PROJECT_NAME of $CI_PROJECT_PATH_SLUG to $CI_ENVIRONMENT_NAME ($DEPLOYMENT_HOST)"
+      - ssh $SSH_USER@$DEPLOYMENT_HOST "git clone --depth 1 $CI_REPOSITORY_URL --branch $DEPLOYMENT_BRANCH --single-branch /tmp/${CI_JOB_ID}/${CI_PROJECT_NAME} && sudo rsync -avzh --chown www-data:www-data --delete --exclude '.git*' /tmp/${CI_JOB_ID}/${CI_PROJECT_NAME} ${DEPLOYMENT_PATH}/html/custom_apps/$NC_APP_NAME && rm -rf /tmp/${CI_JOB_ID}"
+      - ssh $SSH_USER@$DEPLOYMENT_HOST "chown www-data:www-data -R ${DEPLOYMENT_PATH}/html/custom_apps/$NC_APP_NAME
-- 
GitLab


From cb8a622e1d3c9e21faf740060c1a6c5a3c3a3719 Mon Sep 17 00:00:00 2001
From: Fazle Rabbi <fazlerabbi37@e.email>
Date: Wed, 25 May 2022 14:40:47 +0600
Subject: [PATCH 2/4] add deploy by checkout

---
 .gitlab-ci.yml | 20 +++++++-------------
 1 file changed, 7 insertions(+), 13 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c9a8b0b8..144a27c0 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,15 +1,9 @@
-variables:
-  NC_APP_NAME: ecloud_drop_account
 include:
-    - project: 'e/infra/ecloud/nextcloud-apps/ci-templates'
-      ref: dev/template
-      file: 'auto-deploy-pipelines.yml'
+  - project: "e/infra/ecloud/nextcloud-apps/ci-templates"
+    ref: dev/nc-apps-checkout-deploy
+    file: "nc-apps-checkout-deploy.yml"
 
-.deploy:nextcloud-app:
-    stage: deploy
-    script:
-      # overriding script as all it needs is clone, copy and chown
-      # print var to confirm
-      - echo "Deploying $CI_PROJECT_NAME of $CI_PROJECT_PATH_SLUG to $CI_ENVIRONMENT_NAME ($DEPLOYMENT_HOST)"
-      - ssh $SSH_USER@$DEPLOYMENT_HOST "git clone --depth 1 $CI_REPOSITORY_URL --branch $DEPLOYMENT_BRANCH --single-branch /tmp/${CI_JOB_ID}/${CI_PROJECT_NAME} && sudo rsync -avzh --chown www-data:www-data --delete --exclude '.git*' /tmp/${CI_JOB_ID}/${CI_PROJECT_NAME} ${DEPLOYMENT_PATH}/html/custom_apps/$NC_APP_NAME && rm -rf /tmp/${CI_JOB_ID}"
-      - ssh $SSH_USER@$DEPLOYMENT_HOST "chown www-data:www-data -R ${DEPLOYMENT_PATH}/html/custom_apps/$NC_APP_NAME
+.deploy:nextcloud-app-by-checkout:
+  stage: deploy
+  variables:
+    NC_APP_NAME: ecloud_drop_account
-- 
GitLab


From b545fb52dc89136bb39812f6f5e16fc29238e905 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Arnau=20V=C3=A0zquez?= <arnauvp@e.email>
Date: Wed, 25 May 2022 22:40:45 +0000
Subject: [PATCH 3/4] Adjust app name

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

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 144a27c0..4bac1115 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,9 +1,7 @@
-include:
-  - project: "e/infra/ecloud/nextcloud-apps/ci-templates"
-    ref: dev/nc-apps-checkout-deploy
-    file: "nc-apps-checkout-deploy.yml"
+variables:
+  APP_NAME: ecloud-accounts
 
-.deploy:nextcloud-app-by-checkout:
-  stage: deploy
-  variables:
-    NC_APP_NAME: ecloud_drop_account
+include:
+  - project: 'e/infra/ecloud/nextcloud-apps/ci-templates'
+    ref: main
+    file: 'nc-apps-checkout-deploy.yml'
-- 
GitLab


From 3331e7c746d478669041029f7ca84e2933d53a79 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Arnau=20V=C3=A0zquez?= <arnauvp@e.email>
Date: Wed, 25 May 2022 22:43:36 +0000
Subject: [PATCH 4/4] project slug changed

---
 .gitlab-ci.yml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 4bac1115..7ff508da 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,6 +1,3 @@
-variables:
-  APP_NAME: ecloud-accounts
-
 include:
   - project: 'e/infra/ecloud/nextcloud-apps/ci-templates'
     ref: main
-- 
GitLab