Disable the CI

Refactoring the docker file to be functional with the new blender platform and update the pycharm run config

.gitlab-ci.yml

@@ -1,38 +1,38 @@
-cache:
+#cache:
-  key: blender-source
+#  key: blender-source
-  paths:
+#  paths:
-    - /opt/blender-git/blender  # Blender git repository source
+#    - /opt/blender-git/blender  # Blender git repository source
-    - /opt/blender-git/lib      # Blender Subversion lib package
+#    - /opt/blender-git/lib      # Blender Subversion lib package
-  policy: pull
+#  policy: pull
-
+#
-update-cache:
+#update-cache:
-  stage: .pre
+#  stage: .pre
-  cache:
+#  cache:
-    key: blender-source
+#    key: blender-source
-  image: stilobique/csv:latest
+#  image: stilobique/csv:latest
-  script:
+#  script:
-    - mkdir -p /opt/blender-git/lib
+#    - mkdir -p /opt/blender-git/lib
-    - cd /opt/blender-git
+#    - cd /opt/blender-git
-    - git clone https://projects.blender.org/blender/blender.git
+#    - git clone https://projects.blender.org/blender/blender.git
-    - cd /opt/blender-git/blender
+#    - cd /opt/blender-git/blender
-    - git submodule update --init --recursive
+#    - git submodule update --init --recursive
-    - cd /opt/blender-git/lib
+#    - cd /opt/blender-git/lib
-    - svn checkout https://svn.blender.org/svnroot/bf-blender/trunk/lib/linux_centos7_x86_64
+#    - svn checkout https://svn.blender.org/svnroot/bf-blender/trunk/lib/linux_centos7_x86_64
-
+#
-build-dockerfile:
+#build-dockerfile:
-  image: docker:19.03.12
+#  image: docker:19.03.12
-  rules:
+#  rules:
-    - changes:
+#    - changes:
-        - build.json
+#        - build.json
-  stage: build
+#  stage: build
-  services:
+#  services:
-    - docker:dind
+#    - docker:dind
-  cache:
+#  cache:
-    key: blender-source
+#    key: blender-source
-  script:
+#  script:
-    - apk add python3
+#    - apk add python3
-    - apk add py3-pip
+#    - apk add py3-pip
-    - python3 -m pip install --upgrade pip
+#    - python3 -m pip install --upgrade pip
-    - python3 -m pip install -r requirement-build.txt
+#    - python3 -m pip install -r requirement-build.txt
-    - python3 main.py
+#    - python3 main.py
-    - python3 main.py --tag=latest
+#    - python3 main.py --tag=latest

.run/Dockerfile.run.xml

@@ -2,16 +2,16 @@
   <configuration default="false" name="Dockerfile" type="docker-deploy" factoryName="dockerfile" server-name="Docker">
     <deployment type="dockerfile">
       <settings>
-        <option name="imageTag" value="stilobique/blender:3.4.0" />
+        <option name="imageTag" value="stilobique/blender:3.6.12" />
         <option name="buildArgs">
           <list>
             <DockerEnvVarImpl>
               <option name="name" value="b3d_vs_major" />
-              <option name="value" value="3.4" />
+              <option name="value" value="3.6" />
             </DockerEnvVarImpl>
             <DockerEnvVarImpl>
               <option name="name" value="b3d_vs_minor" />
-              <option name="value" value="0" />
+              <option name="value" value="12" />
             </DockerEnvVarImpl>
           </list>
         </option>

Dockerfile

@@ -1,59 +1,91 @@
 FROM ubuntu:22.04 AS blender
 
 # Setup all software version request
-ARG b3d_vs_major=2.90
+ARG b3d_vs_major=3.6
-ARG b3d_vs_minor=0
+ARG b3d_vs_minor=10
-ARG subversion=63014
+ARG version=v${b3d_vs_major}.${b3d_vs_minor}
 
 LABEL Author="stilobique"
 LABEL Title="Blender Docker for Unit Test"
 
-ENV TZ=Europe/Paris
-RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
-
 # Install dependencies
-RUN apt-get update && apt-get install -y \
+RUN apt-get update && apt-get install -y build-essential \
-    build-essential \
-    gcc \
     git \
+    git-lfs \
     cmake \
-    libc6-dev \
+    python3 \
-    libx11-dev \
+    python3-dev \
-    subversion \
+    cython3 \
-    libxrandr-dev \
+    sudo
-    libxcursor-dev \
+
+RUN apt-get install -y libx11-dev \
     libxxf86vm-dev \
-    libxinerama-dev \
+    libxcursor-dev \
-    libglew-dev \
     libxi-dev \
-    python3
+    libxrandr-dev \
+    libxinerama-dev \
+    libxkbcommon-dev \
+    libwayland-dev \
+    libdecor-0-dev \
+    wayland-protocols \
+    libdbus-1-dev \
+    libgl-dev \
+    libegl-dev
 
-# Debug
+RUN apt-get install -y libjpeg-dev \
-RUN echo Build Blender v${b3d_vs_major}.${b3d_vs_minor}
+    libpng-dev \
+    libfreetype-dev \
+    libfontconfig-dev \
+    libzstd-dev \
+    libbz2-dev \
+    liblzma-dev \
+    libsdl2-dev \
+    libepoxy-dev \
+    libxml2-dev \
+    libhpdf-dev \
+    libpystring-dev
 
-ADD . /opt/blender-git
+RUN apt-get install -y libopenjp2-7-dev \
+    libtiff-dev \
+    libjack-jackd2-dev \
+    libpulse-dev \
+    libopenal-dev \
+    libsndfile1-dev \
+    libjemalloc-dev \
+    libvulkan-dev \
+    libgmp-dev \
+    libpugixml-dev \
+    libfftw3-dev \
+    libpotrace-dev \
+    libyaml-cpp-dev \
+    libdeflate-dev
+
+# ADD . /opt/blender-git
+RUN git clone --depth 1 --branch ${version} https://projects.blender.org/blender/blender.git /opt/blender-git
+
+# Use the local repo has current directory
+#WORKDIR /opt/blender-git
 
 # Compile Blender
-RUN cd /opt/blender-git/ \
+RUN cd /opt/blender-git && \
-    && git checkout v${b3d_vs_major}.${b3d_vs_minor} \
+    sudo ./build_files/utils/make_update.py --use-linux-libraries
-    && git config --global user.email "contact@aurelien-vaillant.net" \
+RUN cd /opt/blender-git &&  \
-    && git config --global user.name "Aurelien Vaillant" \
+    make
-    && mkdir /opt/blender-git/lib \
-    && cd /opt/blender-git/lib \
-    && svn checkout -r${subversion} \
-    && make
 
-# Setup a Multistage optimisation
+## Setup a Multistage optimisation
 FROM ubuntu:22.04
-COPY --from=blender /opt/blender-git/build_linux/bin /opt/blender
+COPY --from=blender /opt/build_linux/bin /opt/blender
 ARG b3d_vs_major
 ENV B3D_ADDON_PATH "$HOME/.config/blender/${b3d_vs_major}/scripts/addons"
 
 RUN apt-get update && apt-get install -y \
     libxi6 \
     libxxf86vm1 \
-    libxrender1 \
+    libxfixes3 \
+    libxkbcommon-x11-0 \
+    libjack0 \
+    pulseaudio \
     libgl1-mesa-glx
 
 # Working Directory setup
-WORKDIR /
+WORKDIR /opt/blender

build.json

@@ -1,40 +1,32 @@
 {
   "tags":
   [{
-      "b3d_vs_major": 3.4,
+      "b3d_vs_major": 4.1,
-      "b3d_vs_minor": 1
+      "b3d_vs_minor": 0
     },
     {
-      "b3d_vs_major": 3.4,
+      "b3d_vs_major": 3.6,
-      "b3d_vs_minor": 0
+      "b3d_vs_minor": 12
+    },
+    {
+      "b3d_vs_major": 3.6,
+      "b3d_vs_minor": 11
+    },
+    {
+      "b3d_vs_major": 3.6,
+      "b3d_vs_minor": 10
     },
     {
       "b3d_vs_major": 3.3,
-      "b3d_vs_minor": 2
+      "b3d_vs_minor": 19
     },
     {
       "b3d_vs_major": 3.3,
-      "b3d_vs_minor": 1
+      "b3d_vs_minor": 18
     },
     {
       "b3d_vs_major": 3.3,
-      "b3d_vs_minor": 0
+      "b3d_vs_minor": 17
-    },
-    {
-      "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
     }
   ]
 }