2 Commits
Author SHA1 Message Date
stilobique a561a35030 Fix clean docker job 2026-09-06 20:19:36 +02:00
stilobique 467a6ce0e3 Fix with the branch 5.2 2026-09-06 19:40:07 +02:00
4 changed files with 18 additions and 8 deletions
+1 -1
View File
@@ -8,7 +8,7 @@
<env name="PYTHONUNBUFFERED" value="1" /> <env name="PYTHONUNBUFFERED" value="1" />
</envs> </envs>
<option name="SDK_HOME" value="" /> <option name="SDK_HOME" value="" />
<option name="SDK_NAME" value="BlenderDocker" /> <option name="SDK_NAME" value="Python 3.12 (BlenderDocker)" />
<option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" /> <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
<option name="IS_MODULE_SDK" value="false" /> <option name="IS_MODULE_SDK" value="false" />
<option name="ADD_CONTENT_ROOTS" value="true" /> <option name="ADD_CONTENT_ROOTS" value="true" />
+1 -1
View File
@@ -8,7 +8,7 @@
<env name="PYTHONUNBUFFERED" value="1" /> <env name="PYTHONUNBUFFERED" value="1" />
</envs> </envs>
<option name="SDK_HOME" value="" /> <option name="SDK_HOME" value="" />
<option name="SDK_NAME" value="BlenderDocker" /> <option name="SDK_NAME" value="Python 3.12 (BlenderDocker)" />
<option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/" /> <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/" />
<option name="IS_MODULE_SDK" value="false" /> <option name="IS_MODULE_SDK" value="false" />
<option name="ADD_CONTENT_ROOTS" value="true" /> <option name="ADD_CONTENT_ROOTS" value="true" />
+9 -5
View File
@@ -41,7 +41,10 @@ class BlenderDependency:
def _get_list(self): def _get_list(self):
"""Keep the mandatory 'library' packages (and Wayland Protocols) as Debian/Ubuntu apt names.""" """Keep the mandatory 'library' packages (and Wayland Protocols) as Debian/Ubuntu apt names."""
sources = self.module.BUILD_MANDATORY_SUBPACKAGES + self.module.DEPS_CRITICAL_SUBPACKAGES sources = self.module.BUILD_MANDATORY_SUBPACKAGES
if hasattr(self.module, 'DEPS_CRITICAL_SUBPACKAGES'):
sources += self.module.DEPS_CRITICAL_SUBPACKAGES
for package in self._flatten(sources): for package in self._flatten(sources):
if 'library' not in package.name.lower() and package.name.lower() not in _EXTRA_PACKAGE_NAMES: if 'library' not in package.name.lower() and package.name.lower() not in _EXTRA_PACKAGE_NAMES:
continue continue
@@ -51,10 +54,11 @@ class BlenderDependency:
def _get_complete_list(self): def _get_complete_list(self):
"""All packages required to build Blender (PACKAGES_BASICS_BUILD) as Debian/Ubuntu apt names.""" """All packages required to build Blender (PACKAGES_BASICS_BUILD) as Debian/Ubuntu apt names."""
for package in self._flatten(self.module.PACKAGES_BASICS_BUILD): if hasattr(self.module, 'PACKAGES_BASICS_BUILD'):
name = package.distro_package_names.get(self.module.DISTRO_ID_DEBIAN) for package in self._flatten(self.module.PACKAGES_BASICS_BUILD):
if isinstance(name, str): name = package.distro_package_names.get(self.module.DISTRO_ID_DEBIAN)
self.packages_complete.append(name) if isinstance(name, str):
self.packages_complete.append(name)
def _flatten(self, packages): def _flatten(self, packages):
"""Yield every leaf Package, descending into is_group sub_packages.""" """Yield every leaf Package, descending into is_group sub_packages."""
+6
View File
@@ -90,3 +90,9 @@ def get_all_tags_from_docker():
# All tags data: # All tags data:
for release in j: for release in j:
print(release) print(release)
if __name__ == '__main__':
print('Clean docker')
clean_all_dockers()
print('Done')