Skip to content

fix(ng-dev): cherry-pick renovate config label changes #2877

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
merged 1 commit into from
Jun 27, 2025
Merged

fix(ng-dev): cherry-pick renovate config label changes #2877

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
30 changes: 15 additions & 15 deletions ng-dev/release/publish/actions.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -225,19 +225,6 @@ export abstract class ReleaseAction {
...this.getAspectLockFiles(),
];

if (newVersion.patch === 0 && !newVersion.prerelease) {
// Switch the renovate labels for `target: rc` to `target: patch`
const renovateConfigPath = await updateRenovateConfigTargetLabels(
this.projectDir,
targetLabels['TARGET_RC'].name,
targetLabels['TARGET_PATCH'].name,
);

if (renovateConfigPath) {
filesToCommit.push(renovateConfigPath);
}
}

const commitMessage = getCommitMessageForRelease(newVersion);

// Create a release staging commit including changelog and version bump.
Expand Down Expand Up @@ -595,8 +582,21 @@ export abstract class ReleaseAction {

await this.prependReleaseNotesToChangelog(releaseNotes);

// Create a changelog cherry-pick commit.
await this.createCommit(commitMessage, [workspaceRelativeChangelogPath]);
const filesToCommit: string[] = [workspaceRelativeChangelogPath];
if (releaseNotes.version.patch === 0 && !releaseNotes.version.prerelease) {
// Switch the renovate labels for `target: rc` to `target: patch`
const renovateConfigPath = await updateRenovateConfigTargetLabels(
this.projectDir,
targetLabels['TARGET_RC'].name,
targetLabels['TARGET_PATCH'].name,
);

if (renovateConfigPath) {
filesToCommit.push(renovateConfigPath);
}
}

await this.createCommit(commitMessage, filesToCommit);
Log.info(green(` ✓ Created changelog cherry-pick commit for: "${releaseNotes.version}".`));

// Create a cherry-pick pull request that should be merged by the caretaker.
Expand Down