Skip to content

Commit c1e1757

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 c1e1757

File tree

6 files changed

+5
-24
lines changed

6 files changed

+5
-24
lines changed

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

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -62615,10 +62615,6 @@ var mergeLabels = createTypedObject(MergeLabel)({
6261562615
description: "When the PR is merged, a squash and merge should be performed",
6261662616
name: "merge: squash commits"
6261762617
},
62618-
MERGE_FIX_COMMIT_MESSAGE: {
62619-
description: "When the PR is merged, rewrites/fixups of the commit messages are needed",
62620-
name: "merge: fix commit message"
62621-
},
6262262618
MERGE_CARETAKER_NOTE: {
6262362619
description: "Alert the caretaker performing the merge to check the PR for an out of normal action needed or note",
6262462620
name: "merge: caretaker note"

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

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -46023,10 +46023,6 @@ var mergeLabels = createTypedObject(MergeLabel)({
4602346023
description: "When the PR is merged, a squash and merge should be performed",
4602446024
name: "merge: squash commits"
4602546025
},
46026-
MERGE_FIX_COMMIT_MESSAGE: {
46027-
description: "When the PR is merged, rewrites/fixups of the commit messages are needed",
46028-
name: "merge: fix commit message"
46029-
},
4603046026
MERGE_CARETAKER_NOTE: {
4603146027
description: "Alert the caretaker performing the merge to check the PR for an out of normal action needed or note",
4603246028
name: "merge: caretaker note"

github-actions/branch-manager/main.js

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -46023,10 +46023,6 @@ var mergeLabels = createTypedObject(MergeLabel)({
4602346023
description: "When the PR is merged, a squash and merge should be performed",
4602446024
name: "merge: squash commits"
4602546025
},
46026-
MERGE_FIX_COMMIT_MESSAGE: {
46027-
description: "When the PR is merged, rewrites/fixups of the commit messages are needed",
46028-
name: "merge: fix commit message"
46029-
},
4603046026
MERGE_CARETAKER_NOTE: {
4603146027
description: "Alert the caretaker performing the merge to check the PR for an out of normal action needed or note",
4603246028
name: "merge: caretaker note"

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

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -46488,10 +46488,6 @@ var mergeLabels = createTypedObject(MergeLabel)({
4648846488
description: "When the PR is merged, a squash and merge should be performed",
4648946489
name: "merge: squash commits"
4649046490
},
46491-
MERGE_FIX_COMMIT_MESSAGE: {
46492-
description: "When the PR is merged, rewrites/fixups of the commit messages are needed",
46493-
name: "merge: fix commit message"
46494-
},
4649546491
MERGE_CARETAKER_NOTE: {
4649646492
description: "Alert the caretaker performing the merge to check the PR for an out of normal action needed or note",
4649746493
name: "merge: caretaker note"

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

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -47843,10 +47843,6 @@ var mergeLabels = createTypedObject(MergeLabel)({
4784347843
description: "When the PR is merged, a squash and merge should be performed",
4784447844
name: "merge: squash commits"
4784547845
},
47846-
MERGE_FIX_COMMIT_MESSAGE: {
47847-
description: "When the PR is merged, rewrites/fixups of the commit messages are needed",
47848-
name: "merge: fix commit message"
47849-
},
4785047846
MERGE_CARETAKER_NOTE: {
4785147847
description: "Alert the caretaker performing the merge to check the PR for an out of normal action needed or note",
4785247848
name: "merge: caretaker note"

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

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,11 @@ export const mergeLabels = createTypedObject(MergeLabel)({
1111
description: 'When the PR is merged, a squash and merge should be performed',
1212
name: 'merge: squash commits',
1313
},
14-
MERGE_FIX_COMMIT_MESSAGE: {
15-
description: 'When the PR is merged, rewrites/fixups of the commit messages are needed',
16-
name: 'merge: fix commit message',
17-
},
14+
// TODO: Re-add when we know it works with auto-squash merge strategy
15+
// MERGE_FIX_COMMIT_MESSAGE: {
16+
// description: 'When the PR is merged, rewrites/fixups of the commit messages are needed',
17+
// name: 'merge: fix commit message',
18+
// },
1819
MERGE_CARETAKER_NOTE: {
1920
description:
2021
'Alert the caretaker performing the merge to check the PR for an out of normal action needed or note',

0 commit comments

Comments
 (0)