diff --git a/.github/workflows/patch-release.yml b/.github/workflows/patch-release.yml index fedbdbe6fb393..798222c833601 100644 --- a/.github/workflows/patch-release.yml +++ b/.github/workflows/patch-release.yml @@ -7,7 +7,7 @@ on: tag: description: 'Specify an upstream version tag' required: true - default: 'v1.25.0' + default: 'v1.27.1' suffix: description: 'Optional image tag suffix' default: '' diff --git a/patches/0012-BLENDER-Add-Python-for-external-renderering.patch b/patches/0012-BLENDER-Add-Python-for-external-renderering.patch deleted file mode 100644 index fc197c264148c..0000000000000 --- a/patches/0012-BLENDER-Add-Python-for-external-renderering.patch +++ /dev/null @@ -1,31 +0,0 @@ -From e3a05118181b8d1fecae84d1b6d261c6680ab017 Mon Sep 17 00:00:00 2001 -From: Bart van der Braak -Date: Wed, 4 Dec 2024 15:29:10 +0100 -Subject: [PATCH 12/22] BLENDER: Add Python for external renderering - -To be used for RestructuredText rendering using Sphinx to HTML. - -See: https://projects.blender.org/infrastructure/gitea-custom/src/branch/main/sphinx#deployment ---- - Dockerfile.rootless | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/Dockerfile.rootless b/Dockerfile.rootless -index 4be5a4f8b3..eda41c865b 100644 ---- a/Dockerfile.rootless -+++ b/Dockerfile.rootless -@@ -53,6 +53,11 @@ RUN apk --no-cache add \ - gnupg \ - openssh-keygen - -+# External renderers -+RUN apk --no-cache add \ -+ python3-dev \ -+ && rm -rf /var/cache/apk/* -+ - RUN addgroup \ - -S -g 1000 \ - git && \ --- -2.53.0 - diff --git a/patches/0012-BLENDER-Add-sphinx-build-and-git-lfs-to-Docker-image.patch b/patches/0012-BLENDER-Add-sphinx-build-and-git-lfs-to-Docker-image.patch new file mode 100644 index 0000000000000..3a17154eb5f21 --- /dev/null +++ b/patches/0012-BLENDER-Add-sphinx-build-and-git-lfs-to-Docker-image.patch @@ -0,0 +1,33 @@ +From 391c99f0bec5366ed0f8c5560ef36dfd67d40e1e Mon Sep 17 00:00:00 2001 +From: Bart van der Braak +Date: Wed, 4 Dec 2024 15:29:10 +0100 +Subject: [PATCH] BLENDER: Add `sphinx-build` and `git-lfs` to Docker image + +- RestructuredText rendering using Sphinx to HTML +- Git LFS commandline is used in our `deny_binary` Git hook + +See: https://projects.blender.org/infrastructure/gitea-custom/src/branch/main/sphinx#deployment +--- + Dockerfile.rootless | 6 ++++++ + 1 file changed, 6 insertions(+) + +diff --git a/Dockerfile.rootless b/Dockerfile.rootless +index 4be5a4f8b3..4732f503c8 100644 +--- a/Dockerfile.rootless ++++ b/Dockerfile.rootless +@@ -53,6 +53,12 @@ RUN apk --no-cache add \ + gnupg \ + openssh-keygen + ++# External renderers ++RUN apk add --no-cache python3 py3-sphinx ++ ++# Git hooks ++RUN apk add --no-cache git-lfs ++ + RUN addgroup \ + -S -g 1000 \ + git && \ +-- +2.54.0 + diff --git a/patches/0017-BLENDER-Add-Git-LFS-for-Git-Hook-scripts.patch b/patches/0017-BLENDER-Add-Git-LFS-for-Git-Hook-scripts.patch deleted file mode 100644 index 3496df924bf49..0000000000000 --- a/patches/0017-BLENDER-Add-Git-LFS-for-Git-Hook-scripts.patch +++ /dev/null @@ -1,24 +0,0 @@ -From ec374d0a6b1072d88ec43b9ba287f4af71624ccb Mon Sep 17 00:00:00 2001 -From: Bart van der Braak -Date: Tue, 7 Oct 2025 15:02:05 +0200 -Subject: [PATCH 17/22] BLENDER: Add Git LFS for Git Hook scripts - ---- - Dockerfile.rootless | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/Dockerfile.rootless b/Dockerfile.rootless -index eda41c865b..78cb4dc0b9 100644 ---- a/Dockerfile.rootless -+++ b/Dockerfile.rootless -@@ -49,6 +49,7 @@ RUN apk --no-cache add \ - dumb-init \ - gettext \ - git \ -+ git-lfs \ - curl \ - gnupg \ - openssh-keygen --- -2.53.0 - diff --git a/patches/0018-BLENDER-Add-navigation-bar-icons-on-mobile.patch b/patches/0017-BLENDER-Add-navigation-bar-icons-on-mobile.patch similarity index 100% rename from patches/0018-BLENDER-Add-navigation-bar-icons-on-mobile.patch rename to patches/0017-BLENDER-Add-navigation-bar-icons-on-mobile.patch diff --git a/patches/0019-BLENDER-contributor-agreement-support.patch b/patches/0018-BLENDER-contributor-agreement-support.patch similarity index 100% rename from patches/0019-BLENDER-contributor-agreement-support.patch rename to patches/0018-BLENDER-contributor-agreement-support.patch diff --git a/patches/0020-BLENDER-Add-line-words-and-cursor-indicators.patch b/patches/0019-BLENDER-Add-line-words-and-cursor-indicators.patch similarity index 100% rename from patches/0020-BLENDER-Add-line-words-and-cursor-indicators.patch rename to patches/0019-BLENDER-Add-line-words-and-cursor-indicators.patch diff --git a/patches/0021-BLENDER-Don-t-allow-assigning-a-large-number-of-code.patch b/patches/0020-BLENDER-Don-t-allow-assigning-a-large-number-of-code.patch similarity index 100% rename from patches/0021-BLENDER-Don-t-allow-assigning-a-large-number-of-code.patch rename to patches/0020-BLENDER-Don-t-allow-assigning-a-large-number-of-code.patch diff --git a/patches/0022-BLENDER-Make-Allow-edits-from-maintainers-work-for-p.patch b/patches/0021-BLENDER-Make-Allow-edits-from-maintainers-work-for-p.patch similarity index 100% rename from patches/0022-BLENDER-Make-Allow-edits-from-maintainers-work-for-p.patch rename to patches/0021-BLENDER-Make-Allow-edits-from-maintainers-work-for-p.patch