6 Commits

Author SHA1 Message Date
Thomas Dinges
8327356de4 Release cards: Update for 5.1 2026-03-17 14:52:24 +01:00
Thomas Dinges
646b11c31f Update release card for 5.1 rc 2026-03-13 10:48:52 +01:00
Thomas Dinges
782ed21709 Release Card: Update for 5.1 Beta / 5.2 LTS Alpha 2026-02-06 08:44:24 +01:00
Thomas Dinges
5451020a14 Projects: Add Looptools 2026-02-04 14:11:02 +01:00
Bart van der Braak
3433254eb4 Git Hooks: Fix permission issues 2025-12-18 13:05:25 +01:00
Bart van der Braak
413453ad19 Git Hooks: Add Docker test setup and update documentation 2025-12-18 12:59:18 +01:00
5 changed files with 45 additions and 19 deletions

View File

@@ -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.

View File

@@ -0,0 +1,9 @@
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
user: root

0
git-hooks/notice Normal file → Executable file
View File

View File

@@ -50,6 +50,17 @@
<a href="{{AppSubUrl}}/blender/blender/issues/141609">Under Development</a>
</td>
</tr>
<tr>
<td>
<a href="{{AppSubUrl}}/blender/blender/issues/153880">Modeling: Looptools</a>
</td>
<td>
Porting Looptools into core Blender.
</td>
<td>
<a href="{{AppSubUrl}}/blender/blender/issues/153880">Under Development</a>
</td>
</tr>
<tr>
<td>
<a href="{{AppSubUrl}}/blender/blender/issues/133001">Project Setup</a>

View File

@@ -6,12 +6,12 @@
<div class="description">
<ul>
<li>
<a href="{{AppSubUrl}}/blender/blender/milestone/32">Blender 5.1</a>
<a href="{{AppSubUrl}}/blender/blender/milestone/33">Blender 5.2 LTS</a>
— <strong>Alpha</strong>: New features and changes
</li>
<li>
<a href="{{AppSubUrl}}/blender/blender/milestone/20">Blender 5.0</a>
— Released November 18, 2025
<a href="{{AppSubUrl}}/blender/blender/milestone/32">Blender 5.1</a>
— Released March 17, 2026
</li>
<li>
<a href="{{AppSubUrl}}/blender/blender/milestone/25">Blender 4.5 LTS</a>