Skip to content

Commit

Permalink
[rush] Fix a few issues with the variants PR. (#4944)
Browse files Browse the repository at this point in the history
* Include a missing --variant paramter on phased commands.

* Pass subspace to ensureConsistentVersions in doBasicInstallAsync.

* Make the next relase of Rush a patch bump.
  • Loading branch information
iclanton authored Sep 26, 2024
1 parent 2025e86 commit dfd8f18
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 2 deletions.
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{
"changes": [
{
"packageName": "@microsoft/rush",
"comment": "Fix an issue where the `--variant` parameter was missing from a phased command when the command's `alwaysInstall` property was set to `true`.",
"type": "none"
}
],
"packageName": "@microsoft/rush"
}
2 changes: 1 addition & 1 deletion common/config/rush/version-policies.json
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@
"policyName": "rush",
"definitionName": "lockStepVersion",
"version": "5.136.0",
"nextBump": "minor",
"nextBump": "patch",
"mainProject": "@microsoft/rush"
}
]
Original file line number Diff line number Diff line change
Expand Up @@ -260,7 +260,9 @@ export class PhasedScriptAction extends BaseScriptAction<IPhasedCommandConfig> {
'Normally a phased command expects "rush install" to have been manually run first. If this flag is specified, ' +
'Rush will automatically perform an install before processing the current command.'
});
}

if (this._alwaysInstall !== undefined) {
this._variantParameter = this.defineStringParameter(VARIANT_PARAMETER);
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ export async function doBasicInstallAsync(options: IRunInstallOptions): Promise<

VersionMismatchFinder.ensureConsistentVersions(rushConfiguration, terminal, {
variant,
subspace: undefined
subspace
});
SetupChecks.validate(rushConfiguration);

Expand Down

0 comments on commit dfd8f18

Please sign in to comment.