Skip to content

Commit 4f5707f

Browse files
committed
Copilot instructions for merging :)
1 parent c7b238c commit 4f5707f

File tree

1 file changed

+24
-0
lines changed

1 file changed

+24
-0
lines changed

.github/copilot-instructions.md

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
Please observe the following rules:
2+
3+
If I ask you to merge a PR by giving you the PR number, perform the following tasks:
4+
1. If not yet running start a ssh agent via "eval `ssh-agent`
5+
ssh-add /home/stefan/.ssh/id_ed25519_github_hetzner"
6+
2. Check that no branch `merge-pr-{number}` exists. If it does forcible delete that branch. Create a new branch using the naming convention `merge-pr-{number}`
7+
3. Check out the PR into that branch
8+
4. Check if the PR looks valid. Use `gh pr diff {PR-number} --name-only` to get the list of changed files in the PR. Changes in the PR must only concern subfolders of frameworks and no other directory. Always print the result of that check.
9+
5. You must compute a list of folders that are affected by the PR. Can be a single folder or can be many folders. Example: If the files "package.json" and "package-lock.json" in frameworks/keyed/angular and "package.json" in "frameworks/non-keyed/react" are changed the list is "keyed/angular non-keyed/react", so you leave out the frameworks directory and only report the directory names. This list in the argument for the next step.
10+
Always print the list.
11+
Check if there are changed to files in the webdriver-ts folder (e.g. webdriver-ts/results.json). If so make sure to eliminate those changes by using `git checkout` to restore the original versions such they don't end in the main branch when merging.
12+
6. For the entries run one of the commands from the root directory. You can pass multiple {framework-path} arguemnts to each of the commands (do that please).
13+
* `npm run rebuild {framework-path}` if package.json is changed, but package-lock.json is not.
14+
* `npm run rebuild-ci {framework-path}` if both package.json and package-lock.json are changed for one directory or if both are unchanged.
15+
Just to explain: "npm run rebuild" must be used when the package-lock.json should be regenerated by
16+
npm install. "npm run rebuild-ci" can only be called when npm ci works and package.json and package-lock.json are in sync.
17+
7. if the npm command above reported "======> Please rerun the benchmark:" then the PR can be merged.
18+
* Check first if some file must be added to git and commit it. You can ignore all untracked files.
19+
* Merge the PR using merge commits as the merge strategy
20+
8. Delete the branch after merging
21+
22+
Rules:
23+
* Never push automatically to the remote
24+
* If you run into an error, stop executing and report the error

0 commit comments

Comments
 (0)