Skip to content

fix(rush): don't follow-tags on rush version #5280

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
iclanton merged 3 commits into from
Jul 25, 2025
Merged

fix(rush): don't follow-tags on rush version #5280

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a9e5835
fix(rush): don't follow-tags on publish
aramissennyeydd Jul 23, 2025
2546e2b
add changeset
aramissennyeydd Jul 23, 2025
0f2c639
don't follow tags on rush version not rush publish
aramissennyeydd Jul 23, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions common/changes/@microsoft/rush/sennyeya-blobless-clone_2025-07-23-12-58.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
{
"changes": [
{
"comment": "Improve performance for publishing on filtered clones.",
"type": "none",
"packageName": "@microsoft/rush"
}
],
"packageName": "@microsoft/rush",
"email": "aramissennyeydd@users.noreply.github.com"
}
4 changes: 2 additions & 2 deletions libraries/rush-lib/src/cli/actions/VersionAction.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -280,14 +280,14 @@ export class VersionAction extends BaseRushAction {
}

if (changeLogUpdated || packageJsonUpdated) {
await publishGit.pushAsync(tempBranch, !this._ignoreGitHooksParameter.value);
await publishGit.pushAsync(tempBranch, !this._ignoreGitHooksParameter.value, false);

// Now merge to target branch.
await publishGit.fetchAsync();
await publishGit.checkoutAsync(targetBranch);
await publishGit.pullAsync(!this._ignoreGitHooksParameter.value);
await publishGit.mergeAsync(tempBranch, !this._ignoreGitHooksParameter.value);
await publishGit.pushAsync(targetBranch, !this._ignoreGitHooksParameter.value);
await publishGit.pushAsync(targetBranch, !this._ignoreGitHooksParameter.value, false);
await publishGit.deleteBranchAsync(tempBranch, true, !this._ignoreGitHooksParameter.value);
} else {
// skip commits
Expand Down
8 changes: 6 additions & 2 deletions libraries/rush-lib/src/logic/PublishGit.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,11 @@ export class PublishGit {
]);
}

public async pushAsync(branchName: string | undefined, verify: boolean = false): Promise<void> {
public async pushAsync(
branchName: string | undefined,
verify: boolean = false,
followTags: boolean = true
): Promise<void> {
await PublishUtilities.execCommandAsync(
!!this._targetBranch,
this._gitPath,
Expand All @@ -153,7 +157,7 @@ export class PublishGit {
'push',
'origin',
`HEAD:${branchName || DUMMY_BRANCH_NAME}`,
'--follow-tags',
...(followTags ? ['--follow-tags'] : []),
'--verbose',
...(verify ? [] : ['--no-verify'])
]
Expand Down