forked from angular/angular
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
build: check .ng-dev tool configuration in CI (angular#43322)
Checks the `.ng-dev` tool configuration in CI, compared to doing it locally when the caretaker intends to perform a merge and then realizes the config is broken. PR Close angular#43322
- Loading branch information
1 parent
9b2732c
commit 5472c28
Showing
5 changed files
with
32 additions
and
29 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,33 +1,24 @@ | ||
import {DevInfraMergeConfig} from '@angular/dev-infra-private/ng-dev/pr/merge/config'; | ||
import {getDefaultTargetLabelConfiguration} from '@angular/dev-infra-private/ng-dev/pr/merge/defaults'; | ||
import {github} from './github'; | ||
import {release} from './release'; | ||
import {MergeConfig} from '@angular/dev-infra-private/ng-dev/pr/merge/config'; | ||
|
||
/** | ||
* 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: /^action: merge(-assistance)?/, | ||
caretakerNoteLabel: /^(action: merge-assistance)|(PullApprove: disable)/, | ||
commitMessageFixupLabel: 'commit message fixup', | ||
breakingChangeLabel: 'flag: breaking change', | ||
// We can pick any of the NPM packages as we are in a monorepo where all packages are | ||
// published together with the same version and branching. | ||
labels: await getDefaultTargetLabelConfiguration(api, github, release), | ||
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', | ||
}, | ||
// `dev-infra` and `docs-infra` are not affecting the public NPM packages. Similarly, | ||
// the `bazel` package is not considered part of the public API so that features | ||
// can land in patch branches. | ||
targetLabelExemptScopes: ['dev-infra', 'docs-infra', 'bazel'] | ||
}; | ||
export const merge: MergeConfig = { | ||
githubApiMerge: false, | ||
claSignedLabel: 'cla: yes', | ||
mergeReadyLabel: /^action: merge(-assistance)?/, | ||
caretakerNoteLabel: /^(action: merge-assistance)|(PullApprove: disable)/, | ||
commitMessageFixupLabel: 'commit message fixup', | ||
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', | ||
}, | ||
// `dev-infra` and `docs-infra` are not affecting the public NPM packages. Similarly, | ||
// the `bazel` package is not considered part of the public API so that features | ||
// can land in patch branches. | ||
targetLabelExemptScopes: ['dev-infra', 'docs-infra', 'bazel'] | ||
}; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,10 @@ | ||
{ | ||
"compilerOptions": { | ||
"strict": true, | ||
"target": "es2015", | ||
"module": "commonjs", | ||
"noEmit": true, | ||
"skipLibCheck": true, | ||
"types": [] | ||
}, | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters