Merge branch 'develop'

* develop: Config import before translations.
district09 · Mar 9, 2017 · a20b2ad · a20b2ad
2 parents c352915 + edcfaec
commit a20b2ad
Showing 1 changed file with 1 addition and 5 deletions.
diff --git a/src/RoboFileBase.php b/src/RoboFileBase.php
@@ -72,18 +72,14 @@ protected function updateTask($worker, AbstractAuth $auth, $remote, $extra = [])
         $extra += ['config-import' => false];
         $currentProjectRoot = $remote['currentdir'] . '/..';
         $update = 'vendor/bin/robo digipolis:update-drupal8';
+        $update .= $extra['config-import'] ? ' --config-import' : '';
         $collection = $this->collectionBuilder();
         $collection
             ->taskSsh($worker, $auth)
                 ->remoteDirectory($currentProjectRoot, true)
                 // Updates can take a long time. Let's set it to 15 minutes.
                 ->timeout(900)
                 ->exec($update);
-        if ($extra['config-import']) {
-            $collection->taskSsh($worker, $auth)
-                ->remoteDirectory($currentProjectRoot, true)
-                ->exec('vendor/bin/drupal config:import');
-        }
         return $collection;
     }