Merge branch 'develop' into 'main'

Merging develop into main

See merge request !24

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

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