Skip to content

Commit c8c270d

Browse files
committed
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.
1 parent cc73dde commit c8c270d

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
@@ -62617,7 +62617,8 @@ var mergeLabels = createTypedObject(MergeLabel)({
6261762617
},
6261862618
MERGE_FIX_COMMIT_MESSAGE: {
6261962619
description: "When the PR is merged, rewrites/fixups of the commit messages are needed",
62620-
name: "merge: fix commit message"
62620+
name: "merge: fix commit message",
62621+
repositories: [ManagedRepositories.COMPONENTS, ManagedRepositories.ANGULAR_CLI]
6262162622
},
6262262623
MERGE_CARETAKER_NOTE: {
6262362624
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
@@ -46025,7 +46025,8 @@ var mergeLabels = createTypedObject(MergeLabel)({
4602546025
},
4602646026
MERGE_FIX_COMMIT_MESSAGE: {
4602746027
description: "When the PR is merged, rewrites/fixups of the commit messages are needed",
46028-
name: "merge: fix commit message"
46028+
name: "merge: fix commit message",
46029+
repositories: [ManagedRepositories.COMPONENTS, ManagedRepositories.ANGULAR_CLI]
4602946030
},
4603046031
MERGE_CARETAKER_NOTE: {
4603146032
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
@@ -46025,7 +46025,8 @@ var mergeLabels = createTypedObject(MergeLabel)({
4602546025
},
4602646026
MERGE_FIX_COMMIT_MESSAGE: {
4602746027
description: "When the PR is merged, rewrites/fixups of the commit messages are needed",
46028-
name: "merge: fix commit message"
46028+
name: "merge: fix commit message",
46029+
repositories: [ManagedRepositories.COMPONENTS, ManagedRepositories.ANGULAR_CLI]
4602946030
},
4603046031
MERGE_CARETAKER_NOTE: {
4603146032
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
@@ -46490,7 +46490,8 @@ var mergeLabels = createTypedObject(MergeLabel)({
4649046490
},
4649146491
MERGE_FIX_COMMIT_MESSAGE: {
4649246492
description: "When the PR is merged, rewrites/fixups of the commit messages are needed",
46493-
name: "merge: fix commit message"
46493+
name: "merge: fix commit message",
46494+
repositories: [ManagedRepositories.COMPONENTS, ManagedRepositories.ANGULAR_CLI]
4649446495
},
4649546496
MERGE_CARETAKER_NOTE: {
4649646497
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
@@ -47845,7 +47845,8 @@ var mergeLabels = createTypedObject(MergeLabel)({
4784547845
},
4784647846
MERGE_FIX_COMMIT_MESSAGE: {
4784747847
description: "When the PR is merged, rewrites/fixups of the commit messages are needed",
47848-
name: "merge: fix commit message"
47848+
name: "merge: fix commit message",
47849+
repositories: [ManagedRepositories.COMPONENTS, ManagedRepositories.ANGULAR_CLI]
4784947850
},
4785047851
MERGE_CARETAKER_NOTE: {
4785147852
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)