diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index de8e3ae..0c1fb25 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -16,10 +16,13 @@ update: cache: key: blender-source script: - - mkdir /opt/blender-git -p + - mkdir -p /opt/blender-git/lib - cd /opt/blender-git - - clone https://git.blender.org/blender.git - - svn checkout + - git clone https://git.blender.org/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: rules: diff --git a/Dockerfile b/Dockerfile index 90f81e3..c58c1ea 100644 --- a/Dockerfile +++ b/Dockerfile @@ -40,9 +40,7 @@ RUN cd /opt/blender-git/ \ && git config --global user.name "Aurelien Vaillant" \ && mkdir /opt/blender-git/lib \ && cd /opt/blender-git/lib \ - && svn checkout -r${subversion} https://svn.blender.org/svnroot/bf-blender/trunk/lib/linux_centos7_x86_64 \ - && cd /opt/blender-git/blender \ - && git submodule update --init --recursive \ + && svn checkout -r${subversion} \ && make # Setup a Multistage optimisation