Skip to content

Commit 14e67fc

Browse files
committed
Merge new AI prompt for bundling dependency update PRs
2 parents e316858 + 8be6654 commit 14e67fc

2 files changed

Lines changed: 49 additions & 1 deletion

File tree

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
---
2+
name: bundle-dependency-prs
3+
description: Fix broken dependency update PRs and aggregate the ones that work into one PR.
4+
disable-model-invocation: true
5+
---
6+
7+
# Instructions
8+
9+
You have two goals:
10+
11+
1. Get all dependency PRs to a state where their PR checks pass.
12+
2. Aggregate dependency PRs with passing checks into just one PR.
13+
14+
You can identify dependency update PRs by those authored by `dependabot` or `renovate`.
15+
16+
You'll find instructions for building and validating the repo in the [CONTRIBUTING.md](../../../CONTRIBUTING.md) doc.
17+
Always validate your changes locally before pushing them to the remote repository.
18+
19+
When writing PR bodies or comments, avoid unmatched markdown code fences. Keep markdown well-formed.
20+
21+
## Fix up dependency PRs with failing checks
22+
23+
Before aggregating PRs, first try to fix any individual dependency update PRs with failing build/test checks.
24+
25+
1. For the dependency PRs with failing build or test PR checks, check out their source branch and fix any issues.
26+
2. Push your fixes as fresh commits to the individual dependency PRs.
27+
3. If you can't fix a particular PR, add a comment to the PR describing your attempt and outcome.
28+
29+
## Group dependency PRs that are ready to go
30+
31+
Your next goal is to collect all the dependency updates that are ready to go into a single PR.
32+
33+
1. Prepare a local branch called `bulkDepUpdates`.
34+
1. Consider that a remote branch by the same name may already exist. If it does, base your local branch on it.
35+
2. Merge `origin/main` into this branch.
36+
3. Resolve any conflicts.
37+
2. For the dependency PRs whose build and test PR checks already pass, merge them into the `bulkDepUpdates` branch.
38+
Consider that your local branch may have already merged an equivalent PR in the past (from a past run). If so, you should skip merging that PR.
39+
Resolve any conflicts.
40+
Build and run tests to validate your branch.
41+
3. Push the branch.
42+
4. Create a PR, if one does not already exist.

CONTRIBUTING.md

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,11 @@ This repository can be built on Windows, Linux, and OSX.
4242

4343
Building, testing, and packing this repository can be done by using the standard dotnet CLI commands (e.g. `dotnet build`, `dotnet test`, `dotnet pack`, etc.).
4444

45-
[pwsh]: https://learn.microsoft.com/powershell/scripting/install/installing-powershell
45+
## Testing
46+
47+
You can use `dotnet test` to build and/or test the repo.
48+
49+
There may be tests that are known to be unstable or have special requirements. These can be avoided by running tests using the [dotnet-test-cloud.ps1](tools/dotnet-test-cloud.ps1) script *after* running `dotnet build`.
4650

4751
## Releases
4852

@@ -99,3 +103,5 @@ git checkout origin/main
99103
# resolve any conflicts, then commit the merge commit.
100104
git push origin -u HEAD
101105
```
106+
107+
[pwsh]: https://learn.microsoft.com/powershell/scripting/install/installing-powershell

0 commit comments

Comments
 (0)