[gimp/wip/schumaml/crossraods-optimization] gitlab-ci: cleanup

[Michael Schumacher <schumaml src gnome org>]

commit 60f43d831ed24ab2a8371d6c2d9cc2e461698384
Author: Michael Schumacher <schumaml gmx de>
Date:   Mon Dec 7 20:25:26 2020 +0100

    gitlab-ci: cleanup

 .gitlab-ci.yml                   | 18 +++---------------
 build/docker/CI/Dockerfile.win64 |  4 ++--
 2 files changed, 5 insertions(+), 17 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 6a7460d08a..50aebb05b1 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -51,7 +51,7 @@ build-image-win64:
 build-image-win32:
   stage: prepare
   variables:
-    GIT_STRATEGY: none
+    XDG_DATA_HOME: "/usr/local/lib"
   cache: {}
   image:
     name: gcr.io/kaniko-project/executor:debug
@@ -59,20 +59,8 @@ build-image-win32:
   script:
     - mkdir -p /kaniko/.docker
     - echo 
"{\"auths\":{\"$CI_REGISTRY\":{\"username\":\"$CI_REGISTRY_USER\",\"password\":\"$CI_REGISTRY_PASSWORD\"}}}" 
> /kaniko/.docker/config.json
-    - echo "FROM debian:testing" > Dockerfile
-    - echo "RUN apt-get update && apt-get install -y --no-install-recommends \\" >> Dockerfile
-    - echo "build-essential cpio g++-mingw-w64-i686 gcc-mingw-w64-i686 git intltool libgdk-pixbuf2.0-dev 
libglib2.0-bin meson pkg-config python3 python3-distutils python3-docutils python3-pip rpm wine xsltproc" >> 
Dockerfile
-
-    # install crossroad
-    - echo "RUN pip3 install zstandard" >> Dockerfile
-    - echo "RUN git clone --depth=${GIT_DEPTH} git://git.tuxfamily.org/gitroot/crossroad/crossroad.git" >> 
Dockerfile
-    - echo "RUN cd crossroad && ./setup.py install --prefix=/usr/local && cd .." >> Dockerfile
-    # install babl and GEGL dependencies with crossroad
-    - echo "RUN echo 'export XDG_DATA_HOME=/usr/local/lib && crossroad source msys2 && crossroad install 
lcms2 cairo json-glib' | XDG_DATA_HOME=/usr/local/lib crossroad w32 gimp --run='-'" >> Dockerfile
-    # install GIMP dependencies with crossroad
-    - echo "RUN echo 'export XDG_DATA_HOME=/usr/local/lib && crossroad source msys2 && crossroad install 
appstream-glib atk drmingw gexiv2 glib2 json-c ghostscript iso-codes libheif libmng libmypaint 
mypaint-brushes libwebp libwmf openexr ilmbase poppler poppler-data xpm-nox' | XDG_DATA_HOME=/usr/local/lib 
crossroad w32 gimp --run='-'" >> Dockerfile
-
-    - /kaniko/executor --context $CI_PROJECT_DIR --dockerfile $CI_PROJECT_DIR/Dockerfile --destination 
$CI_REGISTRY_IMAGE:build-win32-latest --cache=true --cache-ttl=120h
+
+    - /kaniko/executor --context $CI_PROJECT_DIR --dockerfile 
$CI_PROJECT_DIR/build/docker/CI/Dockerfile.win32 --destination $CI_REGISTRY_IMAGE:build-win32-latest 
--cache=true --cache-ttl=120h --build-arg XDG_DATA_HOME=$XDG_DATA_HOME
 
 
 ## GNU/Linux 64-bit CIs (Debian testing) ##
diff --git a/build/docker/CI/Dockerfile.win64 b/build/docker/CI/Dockerfile.win64
index 05ff6fb0eb..0948389ce0 100644
--- a/build/docker/CI/Dockerfile.win64
+++ b/build/docker/CI/Dockerfile.win64
@@ -24,7 +24,7 @@ RUN echo 'export XDG_DATA_HOME=$XDG_DATA_HOME && crossroad source msys2 && \
     XDG_DATA_HOME=$XDG_DATA_HOME crossroad w64 gimp --run='-'
 
 # create gdk-pixbuf loaders.cache
-RUN echo 'export XDG_DATA_HOME=/usr/local/lib && \
+RUN echo 'export XDG_DATA_HOME=$XDG_DATA_HOME && \
     export CROSSROAD_PREFIX=${XDG_DATA_HOME}/crossroad/roads/w64/gimp && \
     wine ${XDG_DATA_HOME}/crossroad/roads/w64/gimp/bin/gdk-pixbuf-query-loaders.exe \
     ${XDG_DATA_HOME}/crossroad/roads/w64/gimp/lib/gdk-pixbuf-2.0/2.10.0/loaders/*.dll  > \
@@ -38,4 +38,4 @@ RUN sed -i 's&${XDG_DATA_HOME}/crossroad/roads/w64/gimp/&&' \
 
 # replace / by \ in lines which match '.dll"'
 RUN sed -i '/.dll"/s*/*\\*g' \
-    ${XDG_DATA_HOME}/crossroad/roads/w64/gimp/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache
\ No newline at end of file
+    ${XDG_DATA_HOME}/crossroad/roads/w64/gimp/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache