From 2194f6182e218492d64f9d7fca89f3de104455c0 Mon Sep 17 00:00:00 2001
From: jurgenhaas <juergen.haas@lakedrops.com>
Date: Tue, 14 Jun 2022 13:36:25 +0200
Subject: [PATCH] gitlab-ci-cd/drupal#25 Use new download script to receive db
 or files from live site

---
 ahoy.current.yml | 10 ++++------
 ahoy.live.yml    | 10 ++++------
 2 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/ahoy.current.yml b/ahoy.current.yml
index 8c65c4b..742a31c 100644
--- a/ahoy.current.yml
+++ b/ahoy.current.yml
@@ -2,24 +2,22 @@ ahoyapi: v2
 commands:
   pull:
     cmd: |
-      drush sql:sync --create-db @stage.current @default.dev
+      download db ${PROJECT_BRANCH}
       drush @default.dev cr
       drush -y @default.dev config-split:import develop
-      drush rsync @stage.current:%files/ @default.dev:%files -- --chown=www-data:www-data --safe-links --max-size=20M
-      drush rsync @stage.current:%private/ @default.dev:%private -- --chown=www-data:www-data --safe-links --max-size=20M
+      download files ${PROJECT_BRANCH}
       chmod -R ugo+w files/default/files
       chmod -R ugo+w files/default/private
     usage: Pull files and DB from live site
   pull-sql:
     cmd: |
-      drush sql:sync --create-db @stage.current @default.dev
+      download db ${PROJECT_BRANCH}
       drush @default.dev cr
       drush -y @default.dev config-split:import develop
     usage: Pull DB from live site
   pull-files:
     cmd: |
-      drush rsync @stage.current:%files/ @default.dev:%files -- --chown=www-data:www-data --safe-links --max-size=20M
-      drush rsync @stage.current:%private/ @default.dev:%private -- --chown=www-data:www-data --safe-links --max-size=20M
+      download files ${PROJECT_BRANCH}
       chmod -R ugo+w files/default/files
       chmod -R ugo+w files/default/private
     usage: Pull files from live site
diff --git a/ahoy.live.yml b/ahoy.live.yml
index 18876f1..7987556 100644
--- a/ahoy.live.yml
+++ b/ahoy.live.yml
@@ -2,24 +2,22 @@ ahoyapi: v2
 commands:
   pull:
     cmd: |
-      drush sql:sync --create-db @default.live @default.dev
+      download db
       drush @default.dev cr
       drush -y @default.dev config-split:import develop
-      drush rsync @default.live:%files/ @default.dev:%files -- --chown=www-data:www-data --safe-links --max-size=20M
-      drush rsync @default.live:%private/ @default.dev:%private -- --chown=www-data:www-data --safe-links --max-size=20M
+      download files
       chmod -R ugo+w files/default/files
       chmod -R ugo+w files/default/private
     usage: Pull files and DB from live site
   pull-sql:
     cmd: |
-      drush sql:sync --create-db @default.live @default.dev
+      download db
       drush @default.dev cr
       drush -y @default.dev config-split:import develop
     usage: Pull DB from live site
   pull-files:
     cmd: |
-      drush rsync @default.live:%files/ @default.dev:%files -- --chown=www-data:www-data --safe-links --max-size=20M
-      drush rsync @default.live:%private/ @default.dev:%private -- --chown=www-data:www-data --safe-links --max-size=20M
+      download files
       chmod -R ugo+w files/default/files
       chmod -R ugo+w files/default/private
     usage: Pull files from live site
-- 
GitLab