Merge pull request #1334 from iclanton/ianc/fix-rush-command-line

[rush] Fix an issue where custom command-line arguments aren't passed to projects' builds.
microsoft · Jun 13, 2019 · 5aff38f · 5aff38f
2 parents 9418147 + eac78c1
commit 5aff38f
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 13 deletions.
diff --git a/apps/rush-lib/src/cli/scriptActions/BulkScriptAction.ts b/apps/rush-lib/src/cli/scriptActions/BulkScriptAction.ts
@@ -88,6 +88,9 @@ export class BulkScriptAction extends BaseScriptAction {
 
     // Collect all custom parameter values
     const customParameterValues: string[] = [];
+    for (const customParameter of this.customParameters) {
+      customParameter.appendToArgList(customParameterValues);
+    }
 
     const changedProjectsOnly: boolean = this.actionName === 'build' && this._changedProjectsOnly.value;
 

diff --git a/apps/rush-lib/src/logic/taskRunner/ProjectTask.ts b/apps/rush-lib/src/logic/taskRunner/ProjectTask.ts
@@ -150,19 +150,18 @@ export class ProjectTask implements ITaskDefinition {
           : taskCommand;
 
         writer.writeLine(normalizedTaskCommand);
-        const task: child_process.ChildProcess =
-            Utilities.executeLifecycleCommandAsync(
-            normalizedTaskCommand,
-            {
-              rushConfiguration: this._rushConfiguration,
-              workingDirectory: projectFolder,
-              initCwd: this._rushConfiguration.commonTempFolder,
-              handleOutput: true,
-              environmentPathOptions: {
-                includeProjectBin: true
-              }
+        const task: child_process.ChildProcess = Utilities.executeLifecycleCommandAsync(
+          normalizedTaskCommand,
+          {
+            rushConfiguration: this._rushConfiguration,
+            workingDirectory: projectFolder,
+            initCwd: this._rushConfiguration.commonTempFolder,
+            handleOutput: true,
+            environmentPathOptions: {
+              includeProjectBin: true
             }
-          );
+          }
+        );
 
         // Hook into events, in order to get live streaming of build log
         task.stdout.on('data', (data: string) => {

diff --git a/common/changes/@microsoft/rush/ianc-fix-rush-command-line_2019-06-13-03-47.json b/common/changes/@microsoft/rush/ianc-fix-rush-command-line_2019-06-13-03-47.json
@@ -0,0 +1,11 @@
+{
+  "changes": [
+    {
+      "comment": "Fix an issue where custom command-line parameters weren't passed to projects' builds.",
+      "packageName": "@microsoft/rush",
+      "type": "none"
+    }
+  ],
+  "packageName": "@microsoft/rush",
+  "email": "[email protected]"
+}
diff --git a/common/config/rush/version-policies.json b/common/config/rush/version-policies.json
@@ -82,7 +82,7 @@
     "policyName": "rush",
     "definitionName": "lockStepVersion",
     "version": "5.9.0",
-    "nextBump": "minor",
+    "nextBump": "patch",
     "mainProject": "@microsoft/rush"
   }
 ]