From 413453ad19cef40f40e2e8ff5f91a5886d639461 Mon Sep 17 00:00:00 2001 From: Bart van der Braak Date: Thu, 18 Dec 2025 12:59:18 +0100 Subject: [PATCH] Git Hooks: Add Docker test setup and update documentation --- git-hooks/README.md | 38 +++++++++++++++++++++--------------- git-hooks/docker-compose.yml | 8 ++++++++ 2 files changed, 30 insertions(+), 16 deletions(-) create mode 100644 git-hooks/docker-compose.yml diff --git a/git-hooks/README.md b/git-hooks/README.md index 3e8ba64..9e3a319 100644 --- a/git-hooks/README.md +++ b/git-hooks/README.md @@ -2,34 +2,40 @@ ## Reject Merge Commits -`blender_merged_hook` rejects merge commits to branches were we don't want them. -It is installed as an `pre-receive` hook. - -## Deny Binary Files - -The `deny-binary` rejects binary files, that should have used LFS instead. -It is installed as a `pre-receive` hook. - -To circumvent the rejection you can add `override restrictions` anywhere in the commit message. - -## Repositories - -Repositories with hooks: +The `blender_merged_hook` script rejects merge commits to branches were we don't want them. It is installed as an `pre-receive` hook in the following repositories: - `blender/blender` +- `blender/blender-addons` +- `blender/blender-addons-contrib` - `blender/blender-assets` - `blender/blender-benchmarks` - `blender/blender-developer-docs` - `blender/blender-manual` +- `blender/blender-test-data` - `blender/lib-linux_x64` - `blender/lib-macos_arm64` - `blender/lib-macos_x64` - `blender/lib-source` - `blender/lib-windows_arm64` - `blender/lib-windows_x64` +- `brecht/test-hooks` -Archived repositories that may have hooks, but are not longer being updated: +## Deny Binary Files -- `blender/blender-addons` -- `blender/blender-addons-contrib` +The `deny-binary` script rejects commit that add binary files that should have been tracked as Git LFS object instead. We also provide some tests, which can be run using Docker Compose inside our Gitea container image. It has been installed as a `pre-receive` hook in the following repositories: + +- `blender/blender` +- `blender/blender-assets` +- `blender/blender-benchmarks` +- `blender/blender-developer-docs` +- `blender/blender-manual` - `blender/blender-test-data` +- `blender/lib-linux_x64` +- `blender/lib-macos_arm64` +- `blender/lib-macos_x64` +- `blender/lib-source` +- `blender/lib-windows_arm64` +- `blender/lib-windows_x64` +- `studio/dogwalk` + +To circumvent the rejection you can add `override restrictions` anywhere in the commit message. diff --git a/git-hooks/docker-compose.yml b/git-hooks/docker-compose.yml new file mode 100644 index 0000000..8951efd --- /dev/null +++ b/git-hooks/docker-compose.yml @@ -0,0 +1,8 @@ +services: + gitea_deny_binary_tests: + image: ghcr.io/blender/gitea:v1.25.2 + container_name: gitea_deny_binary_tests + working_dir: /workspace + command: bash -c "./test/run_deny_binary_tests.sh" + volumes: + - ./:/workspace