From 1ad119e7d2dea45a0393d7ed952316f0ab041a13 Mon Sep 17 00:00:00 2001 From: "aurelien.vaillant" Date: Thu, 25 Jun 2026 16:02:17 +0200 Subject: [PATCH] Clear old files --- .gitlab-ci.yml | 38 -------------------------------------- build.json | 34 +--------------------------------- build.yaml | 2 ++ collect_deps.sh | 44 -------------------------------------------- entrypoint.sh | 7 ------- image/Dockerfile-csv | 7 ------- 6 files changed, 3 insertions(+), 129 deletions(-) delete mode 100644 .gitlab-ci.yml create mode 100644 build.yaml delete mode 100644 collect_deps.sh delete mode 100644 entrypoint.sh delete mode 100644 image/Dockerfile-csv diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml deleted file mode 100644 index 908e3dc..0000000 --- a/.gitlab-ci.yml +++ /dev/null @@ -1,38 +0,0 @@ -cache: - key: blender-source - paths: - - /opt/blender-git/blender # Blender git repository source - - /opt/blender-git/lib # Blender Subversion lib package - policy: pull - -update-cache: - stage: .pre - cache: - key: blender-source - image: stilobique/csv:latest - script: - - mkdir -p /opt/blender-git/lib - - cd /opt/blender-git - - git clone https://projects.blender.org/blender/blender.git - - cd /opt/blender-git/blender - - git submodule update --init --recursive - - cd /opt/blender-git/lib - - svn checkout https://svn.blender.org/svnroot/bf-blender/trunk/lib/linux_centos7_x86_64 - -build-dockerfile: - image: docker:19.03.12 - rules: - - changes: - - build.json - stage: build - services: - - docker:dind - cache: - key: blender-source - script: - - apk add python3 - - apk add py3-pip - - python3 -m pip install --upgrade pip - - python3 -m pip install -r requirement-build.txt - - python3 main.py - - python3 main.py --tag=latest diff --git a/build.json b/build.json index 0092fee..af44176 100644 --- a/build.json +++ b/build.json @@ -1,40 +1,8 @@ { "tags": [{ - "b3d_vs_major": 3.4, - "b3d_vs_minor": 1 - }, - { - "b3d_vs_major": 3.4, - "b3d_vs_minor": 0 - }, - { - "b3d_vs_major": 3.3, + "b3d_vs_major": 5.1, "b3d_vs_minor": 2 - }, - { - "b3d_vs_major": 3.3, - "b3d_vs_minor": 1 - }, - { - "b3d_vs_major": 3.3, - "b3d_vs_minor": 0 - }, - { - "b3d_vs_major": 3.2, - "b3d_vs_minor": 1 - }, - { - "b3d_vs_major": 3.2, - "b3d_vs_minor": 0 - }, - { - "b3d_vs_major": 3.1, - "b3d_vs_minor": 2 - }, - { - "b3d_vs_major": 3.1, - "b3d_vs_minor": 0 } ] } \ No newline at end of file diff --git a/build.yaml b/build.yaml new file mode 100644 index 0000000..10baeb8 --- /dev/null +++ b/build.yaml @@ -0,0 +1,2 @@ +- major: 5.1 + minor: 2 \ No newline at end of file diff --git a/collect_deps.sh b/collect_deps.sh deleted file mode 100644 index 992de79..0000000 --- a/collect_deps.sh +++ /dev/null @@ -1,44 +0,0 @@ -#!/bin/bash -set -e - -OUTDIR="$1" -SEARCH_PREFIX="/opt/blender/lib/linux_x64" - -if [ -z "$OUTDIR" ]; then - echo "Usage: $0 " - exit 1 -fi - -# Libs dont la version dans apt est trop ancienne pour Blender 5.x -NEEDED_PREFIXES=( - "libOpenColorIO" # apt=2.1 besoin=2.5 - "libOpenImageIO" # apt=2.4 besoin=3.1 - "libOpenImageIO_Util" - "libopenvdb" # apt=10 besoin=13 - "libosdCPU" # apt=3.5 besoin=3.7 - "libosdGPU" # apt=3.5 besoin=3.7 - "libOpenEXR" # pas dispo en bonne version - "libIex" - "libImath" - "libusd" # pas dans apt - "libceres" # pas dans apt - "liboslcomp" # pas dans apt - "liboslexec" # pas dans apt - "liboslquery" # pas dans apt - "libMaterialX" # pas dans apt - "libembree4" # à vérifier -) - -mkdir -p "$OUTDIR" - -echo "=== Collecte des libs Blender spécifiques ===" - -for prefix in "${NEEDED_PREFIXES[@]}"; do - find "$SEARCH_PREFIX" \ - -name "${prefix}*" \ - -not -type d \ - -exec cp -Pn {} "$OUTDIR/" \; 2>/dev/null || true -done - -echo "Fichiers collectés : $(ls "$OUTDIR" | wc -l)" -du -sh "$OUTDIR" \ No newline at end of file diff --git a/entrypoint.sh b/entrypoint.sh deleted file mode 100644 index 1216e96..0000000 --- a/entrypoint.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/usr/bin/env bash -set -e - -LIB_PATHS="$(find /opt/blender-libs -type d -name lib | paste -sd: -)" -export LD_LIBRARY_PATH="${LIB_PATHS}:${LD_LIBRARY_PATH}" - -exec /usr/local/bin/blender "$@" \ No newline at end of file diff --git a/image/Dockerfile-csv b/image/Dockerfile-csv deleted file mode 100644 index ba97387..0000000 --- a/image/Dockerfile-csv +++ /dev/null @@ -1,7 +0,0 @@ -FROM alpine AS csv - -LABEL Author="stilobique" -LABEL Title="Linux image with subversion and git" - -# Install dependencies -RUN apk add git && apk add subversion \ No newline at end of file