From c8c270dac87d6daee25a0ed9a652191f8a4d4d61 Mon Sep 17 00:00:00 2001 From: Paul Gschwendtner Date: Mon, 31 Mar 2025 17:07:54 +0000 Subject: [PATCH] build: remove fix commit message label as it breaks with autosquash strategy This label and its merge script mode don't work properly with auto-squash. The label was initially built in the components repository; which doesn't use autosquashing. We should not re-add the label automatically. --- .github/local-actions/branch-manager/main.js | 3 ++- .github/local-actions/labels-sync/main.js | 3 ++- github-actions/branch-manager/main.js | 3 ++- github-actions/commit-message-based-labels/main.js | 3 ++- github-actions/unified-status-check/main.js | 3 ++- ng-dev/pr/common/labels/merge.ts | 3 ++- 6 files changed, 12 insertions(+), 6 deletions(-) diff --git a/.github/local-actions/branch-manager/main.js b/.github/local-actions/branch-manager/main.js index 1afaa75b3..972fe14a7 100644 --- a/.github/local-actions/branch-manager/main.js +++ b/.github/local-actions/branch-manager/main.js @@ -62617,7 +62617,8 @@ var mergeLabels = createTypedObject(MergeLabel)({ }, MERGE_FIX_COMMIT_MESSAGE: { description: "When the PR is merged, rewrites/fixups of the commit messages are needed", - name: "merge: fix commit message" + name: "merge: fix commit message", + repositories: [ManagedRepositories.COMPONENTS, ManagedRepositories.ANGULAR_CLI] }, MERGE_CARETAKER_NOTE: { description: "Alert the caretaker performing the merge to check the PR for an out of normal action needed or note", diff --git a/.github/local-actions/labels-sync/main.js b/.github/local-actions/labels-sync/main.js index d0f77b34b..adcc4f8b7 100644 --- a/.github/local-actions/labels-sync/main.js +++ b/.github/local-actions/labels-sync/main.js @@ -46025,7 +46025,8 @@ var mergeLabels = createTypedObject(MergeLabel)({ }, MERGE_FIX_COMMIT_MESSAGE: { description: "When the PR is merged, rewrites/fixups of the commit messages are needed", - name: "merge: fix commit message" + name: "merge: fix commit message", + repositories: [ManagedRepositories.COMPONENTS, ManagedRepositories.ANGULAR_CLI] }, MERGE_CARETAKER_NOTE: { description: "Alert the caretaker performing the merge to check the PR for an out of normal action needed or note", diff --git a/github-actions/branch-manager/main.js b/github-actions/branch-manager/main.js index a6adfcd17..29093f675 100644 --- a/github-actions/branch-manager/main.js +++ b/github-actions/branch-manager/main.js @@ -46025,7 +46025,8 @@ var mergeLabels = createTypedObject(MergeLabel)({ }, MERGE_FIX_COMMIT_MESSAGE: { description: "When the PR is merged, rewrites/fixups of the commit messages are needed", - name: "merge: fix commit message" + name: "merge: fix commit message", + repositories: [ManagedRepositories.COMPONENTS, ManagedRepositories.ANGULAR_CLI] }, MERGE_CARETAKER_NOTE: { description: "Alert the caretaker performing the merge to check the PR for an out of normal action needed or note", diff --git a/github-actions/commit-message-based-labels/main.js b/github-actions/commit-message-based-labels/main.js index 054679094..79a08ac02 100644 --- a/github-actions/commit-message-based-labels/main.js +++ b/github-actions/commit-message-based-labels/main.js @@ -46490,7 +46490,8 @@ var mergeLabels = createTypedObject(MergeLabel)({ }, MERGE_FIX_COMMIT_MESSAGE: { description: "When the PR is merged, rewrites/fixups of the commit messages are needed", - name: "merge: fix commit message" + name: "merge: fix commit message", + repositories: [ManagedRepositories.COMPONENTS, ManagedRepositories.ANGULAR_CLI] }, MERGE_CARETAKER_NOTE: { description: "Alert the caretaker performing the merge to check the PR for an out of normal action needed or note", diff --git a/github-actions/unified-status-check/main.js b/github-actions/unified-status-check/main.js index 04046ec86..4bdad861b 100644 --- a/github-actions/unified-status-check/main.js +++ b/github-actions/unified-status-check/main.js @@ -47845,7 +47845,8 @@ var mergeLabels = createTypedObject(MergeLabel)({ }, MERGE_FIX_COMMIT_MESSAGE: { description: "When the PR is merged, rewrites/fixups of the commit messages are needed", - name: "merge: fix commit message" + name: "merge: fix commit message", + repositories: [ManagedRepositories.COMPONENTS, ManagedRepositories.ANGULAR_CLI] }, MERGE_CARETAKER_NOTE: { description: "Alert the caretaker performing the merge to check the PR for an out of normal action needed or note", diff --git a/ng-dev/pr/common/labels/merge.ts b/ng-dev/pr/common/labels/merge.ts index ffdd5ffff..1b972ca83 100644 --- a/ng-dev/pr/common/labels/merge.ts +++ b/ng-dev/pr/common/labels/merge.ts @@ -1,4 +1,4 @@ -import {createTypedObject, Label} from './base.js'; +import {createTypedObject, Label, ManagedRepositories} from './base.js'; class MergeLabel extends Label {} @@ -14,6 +14,7 @@ export const mergeLabels = createTypedObject(MergeLabel)({ MERGE_FIX_COMMIT_MESSAGE: { description: 'When the PR is merged, rewrites/fixups of the commit messages are needed', name: 'merge: fix commit message', + repositories: [ManagedRepositories.COMPONENTS, ManagedRepositories.ANGULAR_CLI], }, MERGE_CARETAKER_NOTE: { description: