[gimp/wip/schumaml/crossraods-optimization: 26/76] .gitlab-ci.yml: move crossroad install to the build-image-win64 step

[Michael Schumacher <schumaml src gnome org>]

commit 0b3a137515df11e185ed39191e1a7bfee4d4b310
Author: Michael Schumacher <schumaml gmx de>
Date:   Thu Nov 26 20:34:43 2020 +0100

    .gitlab-ci.yml: move crossroad install to the build-image-win64 step

 .gitlab-ci.yml | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 061aa25e1f..1699a3399f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -48,7 +48,12 @@ build-image-win64:
     - echo "FROM debian:testing" > Dockerfile
     - echo "RUN apt-get update" >> Dockerfile
     - echo "RUN apt-get install -y --no-install-recommends \\" >> Dockerfile
-    - echo "build-essential cpio g++-mingw-w64-x86-64 gcc-mingw-w64-x86-64 git intltool libgdk-pixbuf2.0-dev 
libglib2.0-bin meson pkg-config python3 python3-distutils python3-docutils python3-pip rpm xsltproc" >> 
Dockerfile
+    - echo "build-essential cpio g++-mingw-w64-x86-64 gcc-mingw-w64-x86-64 git intltool libgdk-pixbuf2.0-dev 
libglib2.0-bin meson pkg-config python3 python3-distutils python3-docutils python3-pip rpm wine win64 
xsltproc" >> Dockerfile
+    # install crossroad
+    - echo "pip3 install zstandard" >> Dockerfile
+    - echo "git clone --depth=${GIT_DEPTH} git://git.tuxfamily.org/gitroot/crossroad/crossroad.git" >> 
Dockerfile
+    - echo "cd crossroad" >> Dockerfile
+    - echo "./setup.py install --prefix=`pwd`/../.local" >> Dockerfile
 
     - /kaniko/executor --context $CI_PROJECT_DIR --dockerfile $CI_PROJECT_DIR/Dockerfile --destination 
$CI_REGISTRY_IMAGE:build-win64-latest --cache=true --cache-ttl=120h
 
@@ -189,14 +194,6 @@ deps-win64:
     - .cache/crossroad/
     - apt-cache
   before_script:
-    - apt-get update
-    - apt-get install -y --no-install-recommends wine wine64
-
-    - git clone --depth=${GIT_DEPTH} git://git.tuxfamily.org/gitroot/crossroad/crossroad.git
-    - cd crossroad
-    - ./setup.py install --prefix=`pwd`/../.local
-    - cd ..
-    - pip3 install zstandard
   script:
     - export PATH="`pwd`/.local/bin:$PATH"
     - crossroad w64 gimp --run="build/windows/crossbuild-gitlab-ci/build-deps.sh"