blender/blender-developer-docs
7
8
Fork 38
Code Issues 3 Pull Requests 6 Activity

Update "Commiting Test Data" section to include build bot testing #77

Merged
Alaska merged 8 commits from Alaska/blender-developer-docs:test-updates-guide into main 2024-10-07 14:56:31 +02:00
Conversation 2 Commits 8 Files Changed 1 +20 -6
1 changed files with 20 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit ed1cef045a - Show all commits

26
docs/handbook/testing/setup.md
View File

@ -166,14 +166,28 @@ git push me add-x-tests-blender
Ensure your tests pass on the build bot commenting `@blender-bot build`,
Alaska marked this conversation as resolved Outdated
Weizhen Huang commented 2024-10-02 13:05:14 +02:00
Outdated
Review
Copy Link

Should be in the same paragraph as "create a pull request". We can also add a link to the bot https://projects.blender.org/infrastructure/blender-bot/src/branch/main/README.md

Should be in the same paragraph as "create a pull request". We can also add a link to the bot https://projects.blender.org/infrastructure/blender-bot/src/branch/main/README.md
or `@blender-bot build +gpu` to also run GPU tests (these aren't tested
regularly, so some GPU tests you havn't modified may fail), in your pull request.
regularly, so some GPU tests you havn't modified may fail), in your
pull request.
If the tests pass, then push your changes in the test data repo to the
main branch, update your branch of the Blender repo to point to the updated tests,
then push your Blender chages to the main branch of the Blender repo.
If the tests pass, then you can push your changes in the test data
repository to the main branch.
``` bash
TODO: Add commands?
I personally haven't done merging/squishing of branches into main so I'm not sure the correct approach here.
cd tests/data
git checkout main
Sergey Sharybin commented 2024-10-02 11:35:56 +02:00
Outdated
Review
Copy Link

There should be something like

git checkout main
git merge --ff-only add-x-tests
git push origin main

And then land the PR from the Gita interface.
Maybe would be good to have @weizhen, @Sirgienko, or @LukasStockner have a look. They were working with tests more recently than me.

There should be something like ``` git checkout main git merge --ff-only add-x-tests git push origin main ``` And then land the PR from the Gita interface. Maybe would be good to have @weizhen, @Sirgienko, or @LukasStockner have a look. They were working with tests more recently than me.
git merge --ff-only add-x-tests
git push origin main
```
Preferably straight after pushing the updated tests, update
Alaska marked this conversation as resolved Outdated
Weizhen Huang commented 2024-10-02 12:53:18 +02:00
Outdated
Review
Copy Link

It's more straightforward to merge your PR from gitea, that would also close the PR.

It's more straightforward to merge your PR from gitea, that would also close the PR.
your branch of the Blender repository to point to the updated tests,
and push your Blender changes to the main branch of the Blender repo.
``` bash
cd ../..
git commit tests/data
git checkout main
git merge --ff-only add-x-tests-blender
git push origin main
```