Skip to content

Commit a968338

Browse files
committed
ci: require manual approval for NPM updates on non-main branches
Previously, NPM updates were entirely disabled on branches other than main. This change modifies the Renovate configuration to require manual approval for these updates instead of disabling them. This allows for important bug fixes to be manually selected while preventing automatic updates. Additionally, the rule that groups all non-major dependencies for updates has been updated to explicitly apply only to the main branch.
1 parent 6382072 commit a968338

File tree

8 files changed

+1065
-532
lines changed

8 files changed

+1065
-532
lines changed

CHANGELOG.md

Lines changed: 153 additions & 65 deletions
Large diffs are not rendered by default.

CHANGELOG_ARCHIVE.md

Lines changed: 885 additions & 448 deletions
Large diffs are not rendered by default.

CODE_OF_CONDUCT.md

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -14,20 +14,20 @@ appearance, race, religion, or sexual identity and orientation.
1414
Examples of behavior that contributes to creating a positive environment
1515
include:
1616

17-
* Use welcoming and inclusive language
18-
* Respect each other
19-
* Provide and gracefully accept constructive criticism
20-
* Show empathy towards other community members
17+
- Use welcoming and inclusive language
18+
- Respect each other
19+
- Provide and gracefully accept constructive criticism
20+
- Show empathy towards other community members
2121

2222
Examples of unacceptable behavior by participants include:
2323

24-
* Trolling, insulting/derogatory comments, and personal or political attacks
25-
* Public or private harassment
26-
* Publishing others' private information, such as a physical or electronic
24+
- Trolling, insulting/derogatory comments, and personal or political attacks
25+
- Public or private harassment
26+
- Publishing others' private information, such as a physical or electronic
2727
address, without explicit permission
28-
* The use of sexualized language or imagery
29-
* Unwelcome sexual attention or advances
30-
* Other conduct which could reasonably be considered inappropriate in a
28+
- The use of sexualized language or imagery
29+
- Unwelcome sexual attention or advances
30+
- Other conduct which could reasonably be considered inappropriate in a
3131
professional setting
3232

3333
## Our Responsibilities
@@ -69,9 +69,9 @@ members of the project's leadership.
6969

7070
If you are banned you may contest the decision. To do so email [email protected] with the subject line "Repeal Ban for {{your name here}}" and body with the responses to the following:
7171

72-
* Why do you believe you did not violate the Code of Conduct?
73-
* Were other factors involved in this situation the leadership team may have been unaware of?
74-
* Why do you wish to be a part of the Angular community?
72+
- Why do you believe you did not violate the Code of Conduct?
73+
- Were other factors involved in this situation the leadership team may have been unaware of?
74+
- Why do you wish to be a part of the Angular community?
7575

7676
## Attribution
7777

README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
# dev-infra
2+
23
Angular Development Infrastructure

bazel/remote-execution/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,4 @@ docker tag angular-devinfra-rbe-image:latest \
1313
us-west2-docker.pkg.dev/internal-200822/remote-execution-images/angular-devinfra-rbe-image:2025-10
1414

1515
docker push us-west2-docker.pkg.dev/internal-200822/remote-execution-images/angular-devinfra-rbe-image:2025-10
16-
````
16+
```

github-actions/org-file-sync/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Organization File Sync
22

3-
This directory contains an action which can be executed in the `.github` repository. Based on the
3+
This directory contains an action which can be executed in the `.github` repository. Based on the
44
configured list of files and repositories, the action will ensure the all of the provided files in
55
the provided repositories are kept in sync with the `.github` repository.
66

ng-dev/format/formatters/prettier.ts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,11 @@ export class Prettier extends Formatter {
2525
'**/*.{js,cjs,mjs}',
2626
'**/*.{ts,cts,mts}',
2727
'**/*.{json,json5}',
28+
'**/*.md',
2829
'**/*.{yml,yaml}',
30+
31+
// Ignore goldens MD files
32+
'!**/goldens/**/*.api.md',
2933
];
3034

3135
/**

renovate-presets/default.json5

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -56,13 +56,15 @@
5656
matchManagers: ['bazel', 'bazel-module', 'bazelisk'],
5757
},
5858

59-
// Rule to disable NPM updates on branches other than 'main'.
60-
// But allow updating engines and packageManagers.
59+
// Rule to require manual approval for NPM updates on branches other than 'main'.
60+
// This is to prevent auto updates to branches that are not the main branch.
61+
// But, still allows the updates to be manually selected in case of an important bug fix.
62+
// Engines and packageManagers are excluded from this rule.
6163
{
62-
enabled: false,
6364
matchBaseBranches: ['!main'],
64-
matchDepNames: ['!node', '!pnpm', '!npm', '!yarn'],
65+
matchDepNames: ['*', '!node', '!pnpm', '!npm', '!yarn'],
6566
matchManagers: ['npm'],
67+
dependencyDashboardApproval: true,
6668
},
6769

6870
// Group all non-major dependencies together for updates.
@@ -71,6 +73,7 @@
7173
matchDepNames: ['*', '!node', '!pnpm', '!npm', '!yarn'],
7274
matchUpdateTypes: ['digest', 'patch', 'minor'],
7375
matchManagers: ['npm'],
76+
matchBaseBranches: ['main'],
7477
},
7578

7679
// ============================================================================

0 commit comments

Comments
 (0)