Merge branch 'drupalci'

* drupalci:
  Changed grunt command

recipe/frmwrk.common.php

@@ -130,14 +130,23 @@ task('deploy:build_checkout', function () {
 })->desc('Create local build folder');
 
 task('deploy:run_grunt', function () {
-  // NPM Install
+    // Check for Yarn
+
+    $yarnVersion = runLocally('which ng')->toString();
+    if($yarnVersion != ''){
+        $name = 'yarn';
+    } else {
+        $name = 'npm';
+    }
+
+  // Yarn/NPM Install
   // New Drupal 8 standard
   if (runLocally("if [ -f web/themes/custom/" . env('theme_name') . "/package.json ]; then echo 'true'; fi")->toBool()) {
-    runLocally(get('goto_build_dir') . "cd web/themes/custom/" . env('theme_name') . " && npm install", 240);
+    runLocally(get('goto_build_dir') . "cd web/themes/custom/" . env('theme_name') . " && " . $name . " install", 240);
   }
   // Drupal 7 and old Drupal 8 standard
   if (runLocally("if [ -f package.json ]; then echo 'true'; fi")->toBool()) {
-    runLocally(get('goto_build_dir') . "npm install", 240);
+    runLocally(get('goto_build_dir') . $name . " install", 240);
   }
   // Bundle install
   // New Drupal 8 standard