Merge pull request #120 from humpbackdev/feature/fix-import-config-issue

Add the import with existing config

Author: rigoucr

generators/app/templates/deploy-environment/Pantheon/circleci/config.yml

@@ -43,7 +43,14 @@ jobs:
             composer install
             chmod 777 -R ./web/sites/default/files
             cd web
-            if [ -f /var/www/<%= appName %>/config/sync/core.extension.yml ] ; then echo 'Install with config' ; /usr/bin/env PHP_OPTIONS="-d sendmail_path=`which true`" ../vendor/bin/drush si <%= appName %> -y ; ../vendor/bin/drush config-set "system.site" uuid $SITE_UUID -y ; ../vendor/bin/drush cim -y ; else echo 'Install without config' ; /usr/bin/env PHP_OPTIONS="-d sendmail_path=`which true`" ../vendor/bin/drush si <%= appName %> -y ; fi
+            /usr/bin/env PHP_OPTIONS="-d sendmail_path=`which true`"
+            if [ -f /var/www/<%= appName %>/config/sync/core.extension.yml ]; then
+              echo "Installing with existing config..."
+              ../vendor/bin/drush si standard --config-dir="sites/default/config/sync" -y
+            else
+              echo 'Install without config ...'
+              ../vendor/bin/drush si standard -y
+            fi
             cd /var/www/<%= appName %>
       - run:
           name: Coding Standards Linters
@@ -156,10 +163,9 @@ jobs:
             terminus connection:set  <%= dashedAppName %>.dev git
             ahoy site deploy master "Auto deploy triggered from master branch"
             terminus connection:set  <%= dashedAppName %>.dev sftp
-            terminus drush <%= dashedAppName %>.dev -- si <%= appName %> --account-pass=admin -y
+            terminus drush <%= dashedAppName %>.dev -- si <%= appName %> --account-pass=admin --config-dir="sites/default/config/sync" -y
             terminus connection:set  <%= dashedAppName %>.dev git
             terminus drush <%= dashedAppName %>.dev -- config-set "system.site" uuid "$SITE_UUID" -y
-            terminus drush <%= dashedAppName %>.dev -- cim -y
             terminus drush <%= dashedAppName %>.dev -- cr
   deploy-test:
     docker:

generators/app/templates/deploy-environment/Pantheon/composer.json

@@ -20,11 +20,11 @@
     "kporras07/composer-symlinks": "dev-master",
     "drupal/core-recommended": "<%= coreVersion %>",
     "cweagans/composer-patches": "^1.6.5",
-    "pantheon-systems/drupal-integrations": "^8.0"
+    "pantheon-systems/drupal-integrations": "^8.0",
+    "drush/drush": "^9.7.1 | ^10.0.0",
   },
   "require-dev": {
     "testdrupal/behatextension": "dev-update",
-    "drush/drush": "^9.7.1 | ^10.0.0",
     "squizlabs/php_codesniffer": "^3.5",
     "drupal/coder": "^8.2",
     "behat/behat": "3.4.0",

generators/app/templates/deploy-environment/Pantheon/site.ahoy.yml

@@ -22,6 +22,7 @@ commands:
       find ./web/libraries/ -name ".git" -exec rm -rf {} \;
       find ./web/sites/all/libraries/ -name ".git" -exec rm -rf {} \;
       cp -r web $CLONEFOLDER/web
+      cp -r {package.json,package-lock.json} $CLONEFOLDER
       mv vendor $CLONEFOLDER/
       cp pantheon.yml $CLONEFOLDER/
       cd $CLONEFOLDER
@@ -51,9 +52,17 @@ commands:
   install:
     usage: Run install commands
     cmd: |
+      SITE_UUID="<%= siteUuid %>"
       ahoy drush cc drush
-      echo "Installing..."
-      ahoy drush site-install standard --account-pass=admin --site-name="<%= humanName %>" -y
+      if [ -f ./config/sync/core.extension.yml ]; then
+        echo "Installing with existing config..."
+        ahoy drush site-install standard --account-pass=admin --site-name="<%= humanName %>" --config-dir="sites/default/config/sync" -y
+      else
+        echo "Installing the new site..."
+        ahoy drush site-install standard --account-pass=admin --site-name="<%= humanName %>" -y
+        echo "Set site uuid..."
+        ahoy drush config-set "system.site" uuid "$SITE_UUID" -y
+      fi
       echo "Cleaning cache..."
       ahoy drush cr
   install-from-db:

generators/app/templates/deploy-environment/Platformsh/circleci/config.yml

@@ -43,7 +43,14 @@ jobs:
             composer install
             chmod 777 -R ./web/sites/default/files
             cd web
-            if [ -f /var/www/<%= appName %>/config/sync/core.extension.yml ] ; then echo 'Install with config' ; /usr/bin/env PHP_OPTIONS="-d sendmail_path=`which true`" ../vendor/bin/drush si standard -y ; ../vendor/bin/drush cim -y ; else echo 'Install without config' ; /usr/bin/env PHP_OPTIONS="-d sendmail_path=`which true`" ../vendor/bin/drush si standard -y ; fi
+            /usr/bin/env PHP_OPTIONS="-d sendmail_path=`which true`"
+            if [ -f /var/www/<%= appName %>/config/sync/core.extension.yml ]; then
+              echo "Installing with existing config..."
+              ../vendor/bin/drush si standard --config-dir="sites/default/config/sync" -y
+            else
+              echo 'Install without config ...'
+              ../vendor/bin/drush si standard -y
+            fi
             cd /var/www/<%= appName %>
       - run:
           name: Coding Standards Linters

generators/app/templates/deploy-environment/Platformsh/composer.json

@@ -21,7 +21,7 @@
     "drupal/core-recommended": "<%= coreVersion %>",
     "cweagans/composer-patches": "^1.6.5",
     "drupal/redis": "^1.4",
-    "drupal/search_api_solr": "^3.9",
+    "drupal/search_api_solr": "^4.0",
     "drush/drush": "^9.7.1 | ^10.0.0",
     "platformsh/config-reader": "^2.3",
     "symfony/event-dispatcher": "4.3.4 as 3.4.35"
@@ -82,8 +82,7 @@
       "root/.gitignore": "web/.gitignore",
       "settings/settings.php": "web/sites/default/settings.php",
       "settings/settings.local.php": "web/sites/default/settings.local.php",
-      "settings/settings.platformsh.php":
-        "web/sites/default/settings.platformsh.php",
+      "settings/settings.platformsh.php": "web/sites/default/settings.platformsh.php",
       "settings/settings.secret.php": "web/sites/default/settings.secret.php",
       "settings/services.yml": "web/sites/default/services.yml",
       "settings/services.local.yml": "web/sites/default/services.local.yml",

generators/app/templates/deploy-environment/Platformsh/site.ahoy.yml

@@ -37,9 +37,17 @@ commands:
   install:
     usage: Run install commands
     cmd: |
+      SITE_UUID="<%= siteUuid %>"
       ahoy drush cc drush
-      echo "Installing..."
-      ahoy drush site-install standard --account-pass=admin --site-name="<%= humanName %>" -y
+      if [ -f ./config/sync/core.extension.yml ]; then
+        echo "Installing with existing config..."
+        ahoy drush site-install standard --account-pass=admin --site-name="<%= humanName %>" --config-dir="sites/default/config/sync" -y
+      else
+        echo "Installing the new site..."
+        ahoy drush site-install standard --account-pass=admin --site-name="<%= humanName %>" -y
+        echo "Set site uuid..."
+        ahoy drush config-set "system.site" uuid "$SITE_UUID" -y
+      fi
       echo "Cleaning cache..."
       ahoy drush cr
   install-from-db: