Skip to content

Commit 78f80fa

Browse files
authored
build: remove fix commit message label as it breaks with autosquash strategy (#2696)
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.
1 parent a9c1c54 commit 78f80fa

File tree

6 files changed

+12
-6
lines changed

6 files changed

+12
-6
lines changed

.github/local-actions/branch-manager/main.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62881,7 +62881,8 @@ var mergeLabels = createTypedObject(MergeLabel)({
6288162881
},
6288262882
MERGE_FIX_COMMIT_MESSAGE: {
6288362883
description: "When the PR is merged, rewrites/fixups of the commit messages are needed",
62884-
name: "merge: fix commit message"
62884+
name: "merge: fix commit message",
62885+
repositories: [ManagedRepositories.COMPONENTS, ManagedRepositories.ANGULAR_CLI]
6288562886
},
6288662887
MERGE_CARETAKER_NOTE: {
6288762888
description: "Alert the caretaker performing the merge to check the PR for an out of normal action needed or note",

.github/local-actions/labels-sync/main.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46546,7 +46546,8 @@ var mergeLabels = createTypedObject(MergeLabel)({
4654646546
},
4654746547
MERGE_FIX_COMMIT_MESSAGE: {
4654846548
description: "When the PR is merged, rewrites/fixups of the commit messages are needed",
46549-
name: "merge: fix commit message"
46549+
name: "merge: fix commit message",
46550+
repositories: [ManagedRepositories.COMPONENTS, ManagedRepositories.ANGULAR_CLI]
4655046551
},
4655146552
MERGE_CARETAKER_NOTE: {
4655246553
description: "Alert the caretaker performing the merge to check the PR for an out of normal action needed or note",

github-actions/branch-manager/main.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46546,7 +46546,8 @@ var mergeLabels = createTypedObject(MergeLabel)({
4654646546
},
4654746547
MERGE_FIX_COMMIT_MESSAGE: {
4654846548
description: "When the PR is merged, rewrites/fixups of the commit messages are needed",
46549-
name: "merge: fix commit message"
46549+
name: "merge: fix commit message",
46550+
repositories: [ManagedRepositories.COMPONENTS, ManagedRepositories.ANGULAR_CLI]
4655046551
},
4655146552
MERGE_CARETAKER_NOTE: {
4655246553
description: "Alert the caretaker performing the merge to check the PR for an out of normal action needed or note",

github-actions/commit-message-based-labels/main.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47011,7 +47011,8 @@ var mergeLabels = createTypedObject(MergeLabel)({
4701147011
},
4701247012
MERGE_FIX_COMMIT_MESSAGE: {
4701347013
description: "When the PR is merged, rewrites/fixups of the commit messages are needed",
47014-
name: "merge: fix commit message"
47014+
name: "merge: fix commit message",
47015+
repositories: [ManagedRepositories.COMPONENTS, ManagedRepositories.ANGULAR_CLI]
4701547016
},
4701647017
MERGE_CARETAKER_NOTE: {
4701747018
description: "Alert the caretaker performing the merge to check the PR for an out of normal action needed or note",

github-actions/unified-status-check/main.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48361,7 +48361,8 @@ var mergeLabels = createTypedObject(MergeLabel)({
4836148361
},
4836248362
MERGE_FIX_COMMIT_MESSAGE: {
4836348363
description: "When the PR is merged, rewrites/fixups of the commit messages are needed",
48364-
name: "merge: fix commit message"
48364+
name: "merge: fix commit message",
48365+
repositories: [ManagedRepositories.COMPONENTS, ManagedRepositories.ANGULAR_CLI]
4836548366
},
4836648367
MERGE_CARETAKER_NOTE: {
4836748368
description: "Alert the caretaker performing the merge to check the PR for an out of normal action needed or note",

ng-dev/pr/common/labels/merge.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import {createTypedObject, Label} from './base.js';
1+
import {createTypedObject, Label, ManagedRepositories} from './base.js';
22

33
class MergeLabel extends Label {}
44

@@ -14,6 +14,7 @@ export const mergeLabels = createTypedObject(MergeLabel)({
1414
MERGE_FIX_COMMIT_MESSAGE: {
1515
description: 'When the PR is merged, rewrites/fixups of the commit messages are needed',
1616
name: 'merge: fix commit message',
17+
repositories: [ManagedRepositories.COMPONENTS, ManagedRepositories.ANGULAR_CLI],
1718
},
1819
MERGE_CARETAKER_NOTE: {
1920
description:

0 commit comments

Comments
 (0)