Skip to content

Commit 8d7be45

Browse files
alan-agius4filipesilva
authored andcommitted
build: update dev-infra merge configuration
Merge configuration no longer accepts custom labels, in order to achieve consistent labelling as specified in the Angular versioning/branching/labelling spec.
1 parent 36ee8cf commit 8d7be45

File tree

1 file changed

+10
-19
lines changed

1 file changed

+10
-19
lines changed

.ng-dev/merge.ts

Lines changed: 10 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,16 @@
1-
import { DevInfraMergeConfig } from '@angular/dev-infra-private/ng-dev/pr/merge/config';
2-
import { getDefaultTargetLabelConfiguration } from '@angular/dev-infra-private/ng-dev/pr/merge/defaults';
3-
import { github } from './github';
4-
import { release } from './release';
1+
import { MergeConfig } from '@angular/dev-infra-private/ng-dev/pr/merge/config';
52

63
/**
74
* Configuration for the merge tool in `ng-dev`. This sets up the labels which
85
* are respected by the merge script (e.g. the target labels).
96
*/
10-
export const merge: DevInfraMergeConfig['merge'] = async (api) => {
11-
return {
12-
githubApiMerge: {
13-
default: 'rebase',
14-
labels: [{ pattern: 'squash commits', method: 'squash' }],
15-
},
16-
claSignedLabel: 'cla: yes',
17-
breakingChangeLabel: 'flag: breaking change',
18-
mergeReadyLabel: /^action: merge(-assistance)?/,
19-
caretakerNoteLabel: /(action: merge-assistance)/,
20-
commitMessageFixupLabel: 'commit message fixup',
21-
// We can pick any of the NPM packages as we are in a monorepo where all packages are
22-
// published together with the same version and branching.
23-
labels: await getDefaultTargetLabelConfiguration(api, github, release),
24-
};
7+
export const merge: MergeConfig = {
8+
githubApiMerge: {
9+
default: 'rebase',
10+
labels: [{ pattern: 'squash commits', method: 'squash' }],
11+
},
12+
claSignedLabel: 'cla: yes',
13+
mergeReadyLabel: /^action: merge(-assistance)?/,
14+
caretakerNoteLabel: /(action: merge-assistance)/,
15+
commitMessageFixupLabel: 'commit message fixup',
2516
};

0 commit comments

Comments
 (0)