Skip to content

Commit 60cda52

Browse files
build: setup action for identifying changes needing to be tested in google (#25931)
* build: update angular shared dev-infra code * build: update ng-dev configuration to account for deleted config options * build: setup action for identifying changes needing to be tested in google This will be the public part of the Angular Presubmit Status service. We will be able to remove the `merge safe` label- but for now we keep it until we decide what to do with it. I could also imagine this action automatically applying such a label for better filtering. At the same time though, for a caretaker it should likely not matter because the GitHub status checks are sufficient indicator (now with the new service) whether a PR is ready or not. Co-authored-by: Angular Robot <[email protected]>
1 parent fcfb99d commit 60cda52

File tree

8 files changed

+260
-1072
lines changed

8 files changed

+260
-1072
lines changed

.github/workflows/dev-infra.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,13 @@ jobs:
1212
runs-on: ubuntu-latest
1313
steps:
1414
- uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b # tag=v3.0.2
15-
- uses: angular/dev-infra/github-actions/commit-message-based-labels@604d67220ea3a92d23e603873b2a9d3d217973f5
15+
- uses: angular/dev-infra/github-actions/commit-message-based-labels@7d103b83a07f132629592fc9918ce17d42a5e382
1616
with:
1717
angular-robot-key: ${{ secrets.ANGULAR_ROBOT_PRIVATE_KEY }}
1818
post_approval_changes:
1919
runs-on: ubuntu-latest
2020
steps:
2121
- uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b # tag=v3.0.2
22-
- uses: angular/dev-infra/github-actions/post-approval-changes@db59d4951f9ec1ea6736a55fc99228340083ad19
22+
- uses: angular/dev-infra/github-actions/post-approval-changes@7d103b83a07f132629592fc9918ce17d42a5e382
2323
with:
2424
angular-robot-key: ${{ secrets.ANGULAR_ROBOT_PRIVATE_KEY }}
Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
name: Google Internal Tests Enforcement
2+
3+
on:
4+
pull_request_target:
5+
types: [opened, reopened, synchronize]
6+
7+
permissions:
8+
pull-requests: read
9+
statuses: write
10+
11+
jobs:
12+
trigger:
13+
runs-on: ubuntu-latest
14+
steps:
15+
- uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 # tag=v3.1.0
16+
- uses: angular/dev-infra/github-actions/google-internal-tests@d87b1b56a970132f90301624cea6b6d70b6d9489
17+
with:
18+
run-tests-guide-url: http://go/angular-material-presubmit
19+
github-token: ${{ secrets.GITHUB_TOKEN }}
20+
sync-config: ./.ng-dev/google-sync-config.json

.github/workflows/lock-closed.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,6 @@ jobs:
1111
lock_closed:
1212
runs-on: ubuntu-latest
1313
steps:
14-
- uses: angular/dev-infra/github-actions/lock-closed@db59d4951f9ec1ea6736a55fc99228340083ad19
14+
- uses: angular/dev-infra/github-actions/lock-closed@7d103b83a07f132629592fc9918ce17d42a5e382
1515
with:
1616
lock-bot-key: ${{ secrets.LOCK_BOT_PRIVATE_KEY }}

.ng-dev/caretaker.mts

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,16 @@ export const caretaker: CaretakerConfig = {
55
githubQueries: [
66
{
77
name: 'Merge Queue',
8-
query: `is:pr is:open status:success label:"pr: merge ready"`,
8+
query: `is:pr is:open status:success label:"action: merge"`,
9+
},
10+
{
11+
name: 'Merge Assistance Queue',
12+
query: `is:pr is:open label:"merge: caretaker note" label:"action: merge"`,
913
},
1014
{
1115
name: 'Triage Queue',
1216
query: `is:open label:"needs triage"`,
1317
},
1418
],
19+
g3SyncConfigPath: './.ng-dev/google-sync-config.json',
1520
};

.ng-dev/google-sync-config.json

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
{
2+
// Note: When changing, make sure to keep in sync with the internal Copybara config.
3+
"syncedFilePatterns": [
4+
"LICENSE",
5+
"README.md",
6+
"src/material/**.ts",
7+
"src/material/**.html",
8+
"src/material/**.scss",
9+
"src/material-experimental/**.ts",
10+
"src/material-experimental/**.html",
11+
"src/material-experimental/**.scss",
12+
"src/cdk/**.ts",
13+
"src/cdk/**.html",
14+
"src/cdk/**.scss",
15+
"src/cdk-experimental/**.ts",
16+
"src/cdk-experimental/**.html",
17+
"src/cdk-experimental/**.scss",
18+
"src/google-maps/**.ts",
19+
"src/google-maps/**.html",
20+
"src/google-maps/**.scss"
21+
],
22+
"alwaysExternalFilePatterns": [
23+
"**/typings.d.ts",
24+
"src/**/*spec.ts",
25+
"src/cdk/schematics/**",
26+
"src/material/schematics/**",
27+
"src/cdk/testing/testbed/zone-types.d.ts",
28+
"src/material/_theming.scss",
29+
"src/material/index.ts",
30+
"src/material/module.ts",
31+
"src/material/core/index.ts",
32+
"src/material/legacy-core/index.ts",
33+
"src/material/core/theming/tests/**",
34+
"src/material/expansion/index.ts",
35+
"**import.scss"
36+
]
37+
}

.ng-dev/pull-request.mts

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,4 @@ export const pullRequest: PullRequestConfig = {
1313
default: 'squash',
1414
labels: [{pattern: 'merge: preserve commits', method: 'rebase'}],
1515
},
16-
mergeReadyLabel: 'action: merge',
17-
commitMessageFixupLabel: 'merge: fix commit message',
18-
caretakerNoteLabel: 'merge: caretaker note',
1916
};

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,11 +73,11 @@
7373
"@angular-devkit/core": "^15.0.0-rc.1",
7474
"@angular-devkit/schematics": "^15.0.0-rc.1",
7575
"@angular/bazel": "^15.0.0-rc.1",
76-
"@angular/build-tooling": "https://github.com/angular/dev-infra-private-build-tooling-builds.git#a96fc0c88c55faf5314dd373ebe86b0f3a95c776",
76+
"@angular/build-tooling": "https://github.com/angular/dev-infra-private-build-tooling-builds.git#fb42478534df7d48ec23a6834fea94a776cb89a0",
7777
"@angular/cli": "^15.0.0-rc.1",
7878
"@angular/compiler-cli": "^15.0.0-rc.1",
7979
"@angular/localize": "^15.0.0-rc.1",
80-
"@angular/ng-dev": "https://github.com/angular/dev-infra-private-ng-dev-builds.git#73935ddb0fc3ede9b10db7a0780173fa1f82cd22",
80+
"@angular/ng-dev": "https://github.com/angular/dev-infra-private-ng-dev-builds.git#d1b5e1929c8b01f7621d65c54a52ac6a9adb22ad",
8181
"@angular/platform-browser-dynamic": "^15.0.0-rc.1",
8282
"@angular/platform-server": "^15.0.0-rc.1",
8383
"@angular/router": "^15.0.0-rc.1",

0 commit comments

Comments
 (0)