Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/dev-infra.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,13 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
- uses: angular/dev-infra/github-actions/pull-request-labeling@c584c3565b71c7a8cda81d55bb14e3e66ef934da
- uses: angular/dev-infra/github-actions/labeling/pull-request@d45884cba93817d0e1a2be67ca5638227f64e508
with:
angular-robot-key: ${{ secrets.ANGULAR_ROBOT_PRIVATE_KEY }}
post_approval_changes:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
- uses: angular/dev-infra/github-actions/post-approval-changes@c584c3565b71c7a8cda81d55bb14e3e66ef934da
- uses: angular/dev-infra/github-actions/post-approval-changes@d45884cba93817d0e1a2be67ca5638227f64e508
with:
angular-robot-key: ${{ secrets.ANGULAR_ROBOT_PRIVATE_KEY }}
2 changes: 1 addition & 1 deletion .github/workflows/google-internal-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
- uses: angular/dev-infra/github-actions/google-internal-tests@c584c3565b71c7a8cda81d55bb14e3e66ef934da
- uses: angular/dev-infra/github-actions/google-internal-tests@d45884cba93817d0e1a2be67ca5638227f64e508
with:
run-tests-guide-url: http://go/angular-material-presubmit
github-token: ${{ secrets.GITHUB_TOKEN }}
Expand Down
4 changes: 1 addition & 3 deletions .ng-dev/format.mts
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,5 @@ import {FormatConfig} from '@angular/ng-dev';
*/
export const format: FormatConfig = {
buildifier: true,
prettier: {
matchers: ['**/*.{js,ts,mts,mjs,json}'],
},
prettier: true,
};
2 changes: 1 addition & 1 deletion .ng-dev/github.mts
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,5 @@ export const github: GithubConfig = {
owner: 'angular',
name: 'components',
mainBranchName: 'main',
useNgDevAuthService: true,
mergeMode: 'team-only',
};
1 change: 1 addition & 0 deletions .ng-dev/pull-request.mts
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,5 @@ export const pullRequest: PullRequestConfig = {
default: 'squash',
labels: [{pattern: 'merge: preserve commits', method: 'rebase'}],
},
requiredStatuses: [{type: 'status', name: 'google-internal-tests'}],
};
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@
"devDependencies": {
"@angular/compiler-cli": "catalog:",
"@angular/localize": "catalog:",
"@angular/ng-dev": "https://github.com/angular/dev-infra-private-ng-dev-builds.git#3c4fd6f54f2c67ce5b9f1a32ce90e36ba2fada4e",
"@angular/ng-dev": "https://github.com/angular/dev-infra-private-ng-dev-builds.git#37be0b2012ab2d2f58d575689b1bac74eed56e41",
"@angular/platform-server": "catalog:",
"@angular/router": "catalog:",
"@babel/core": "^7.16.12",
Expand Down
Loading
Loading