7723bfd9ba
We introduced a new shared configuration for merge script labels that follow the proposal of: https://docs.google.com/document/d/197kVillDwx-RZtSVOBtPb4BBIAw0E9RT3q3v6DZkykU These label semantics and the branching are set up for the Angular framework with this commit. The goal is that labeling and merging is consistent between all Angular projects and that clear rules are defined for branching. This was previously not the case. PR Close #38428
26 lines
1.1 KiB
TypeScript
26 lines
1.1 KiB
TypeScript
import {DevInfraMergeConfig} from '../dev-infra/pr/merge/config';
|
|
import {getDefaultTargetLabelConfiguration} from '../dev-infra/pr/merge/defaults';
|
|
import {github} from './github';
|
|
|
|
/**
|
|
* Configuration for the merge tool in `ng-dev`. This sets up the labels which
|
|
* are respected by the merge script (e.g. the target labels).
|
|
*/
|
|
export const merge: DevInfraMergeConfig['merge'] = async api => {
|
|
return {
|
|
githubApiMerge: false,
|
|
claSignedLabel: 'cla: yes',
|
|
mergeReadyLabel: /^PR action: merge(-assistance)?/,
|
|
caretakerNoteLabel: 'PR action: merge-assistance',
|
|
commitMessageFixupLabel: 'commit message fixup',
|
|
labels: await getDefaultTargetLabelConfiguration(api, github, '@angular/core'),
|
|
requiredBaseCommits: {
|
|
// PRs that target either `master` or the patch branch, need to be rebased
|
|
// on top of the latest commit message validation fix.
|
|
// These SHAs are the commits that update the required license text in the header.
|
|
'master': '5aeb9a4124922d8ac08eb73b8f322905a32b0b3a',
|
|
'10.0.x': '27b95ba64a5d99757f4042073fd1860e20e3ed24'
|
|
},
|
|
};
|
|
};
|