gitlab-ci: Reduce redundancy on Windows cross jobs (take 2)

Following 129c1637a9

.gitlab-ci.yml

@@ -411,11 +411,13 @@ packaging-flatpak-x64:
 .win-cross:
   extends: .default
   variables:
+    BUILD_TYPE: "CI_CROSS"
     # Needed because by default, Debian has now changed
     # "sysconfig.get_default_scheme()" from "posix_prefix" to "posix_local" which
     # adds a local/ folder to the install prefix of setup.py. This environment
     # variable overrides this behavior.
     DEB_PYTHON_INSTALL_LAYOUT: "deb"
+    PATH: "$CI_PROJECT_DIR/.local/bin:$CI_PROJECT_DIR/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
     XDG_DATA_HOME: "$CI_PROJECT_DIR/.local/share/"
     XDG_CACHE_HOME: "$CI_PROJECT_DIR/.cache/"
   cache:
@@ -441,14 +443,7 @@ deps-win-x64-cross:
   stage: dependencies
   image: $CI_REGISTRY_IMAGE:build-debian-latest
   before_script:
-    - apt-get install -y --no-install-recommends
+    - bash -x build/windows/gitlab-ci/1_build-deps-crossroad.sh
-                         wine
-                         wine64
-    - git clone --depth=${GIT_DEPTH} https://gitlab.freedesktop.org/crossroad/crossroad.git
-    - cd crossroad
-    - ./setup.py install --prefix=`pwd`/../.local
-    - cd ..
-    - export PATH="`pwd`/.local/bin:$PATH"
   script:
     - crossroad w64 gimp --run="build/windows/gitlab-ci/1_build-deps-crossroad.sh"
   artifacts:
@@ -478,15 +473,12 @@ gimp-win-x64-cross:
     - echo export GI_TYPELIB_PATH="${GIMP_PREFIX}/${LIB_DIR}/${LIB_SUBDIR}girepository-1.0${GI_TYPELIB_PATH:+:$GI_TYPELIB_PATH}" >> bin/gimp-console-$GIMP_APP_VERSION
     - echo "${GIMP_PREFIX}/bin/gimp-console-$GIMP_APP_VERSION \"\$@\"" >> bin/gimp-console-$GIMP_APP_VERSION
     - chmod u+x bin/gimp-console-$GIMP_APP_VERSION
-    - export PATH="`pwd`/bin:$PATH"
-    # For crossroad
-    - export PATH="`pwd`/.local/bin:$PATH"
   script:
     - crossroad w64 gimp --run="build/windows/gitlab-ci/2_build-gimp-crossroad.sh"
   artifacts:
     paths:
-      - _build-x64-cross/
       - _install-x64-cross/
+      - _build-x64-cross/
     expire_in: 1 day
 
 packaging-win-x64-nightly:
@@ -496,7 +488,6 @@ packaging-win-x64-nightly:
   needs: ["gimp-win-x64-cross"]
   stage: packaging
   variables:
-    BUILD_TYPE: "CI_CROSS"
     CROSSROAD_PLATFORM: "w64"
   cache: []
   before_script:
@@ -533,14 +524,7 @@ deps-win-x86-cross:
   stage: dependencies
   image: $CI_REGISTRY_IMAGE:build-debian-latest
   before_script:
-    - apt-get update
+    - bash -x build/windows/gitlab-ci/1_build-deps-crossroad.sh
-    - apt-get install -y --no-install-recommends
-                         wine
-    - git clone --depth=${GIT_DEPTH} https://gitlab.freedesktop.org/crossroad/crossroad.git
-    - cd crossroad
-    - ./setup.py install --prefix=`pwd`/../.local
-    - cd ..
-    - export PATH="`pwd`/.local/bin:$PATH"
   script:
     - crossroad w32 gimp --run="build/windows/gitlab-ci/1_build-deps-crossroad.sh"
   artifacts:
@@ -570,15 +554,12 @@ gimp-win-x86-cross:
     - echo export GI_TYPELIB_PATH="${GIMP_PREFIX}/${LIB_DIR}/${LIB_SUBDIR}girepository-1.0${GI_TYPELIB_PATH:+:$GI_TYPELIB_PATH}" >> bin/gimp-console-$GIMP_APP_VERSION
     - echo "${GIMP_PREFIX}/bin/gimp-console-$GIMP_APP_VERSION \"\$@\"" >> bin/gimp-console-$GIMP_APP_VERSION
     - chmod u+x bin/gimp-console-$GIMP_APP_VERSION
-    - export PATH="`pwd`/bin:$PATH"
-    # For crossroad
-    - export PATH="`pwd`/.local/bin:$PATH"
   script:
     - crossroad w32 gimp --run="build/windows/gitlab-ci/2_build-gimp-crossroad.sh"
   artifacts:
     paths:
-      - _build-x86-cross/
       - _install-x86-cross/
+      - _build-x86-cross/
     expire_in: 1 day
 
 packaging-win-x86-nightly:
@@ -588,7 +569,6 @@ packaging-win-x86-nightly:
   needs: ["gimp-win-x86-cross"]
   stage: packaging
   variables:
-    BUILD_TYPE: "CI_CROSS"
     CROSSROAD_PLATFORM: "w32"
   cache: []
   before_script:

build/windows/gitlab-ci/1_build-deps-crossroad.sh

@@ -1,30 +1,42 @@
+#!/bin/sh
+
+# BASH ENV
+if [[ -z "$CROSSROAD_PLATFORM" ]]; then
+apt-get install -y --no-install-recommends \
+                   wine \
+                   wine64
+git clone --depth=${GIT_DEPTH} https://gitlab.freedesktop.org/crossroad/crossroad.git
+cd crossroad
+./setup.py install --prefix=`pwd`/../.local
+cd ..
+exit 0
+
+
+# CROSSROAD ENV
+else
 if [[ "x$CROSSROAD_PLATFORM" = "xw64" ]]; then
   export ARTIFACTS_SUFFIX="-x64"
 else # [[ "x$CROSSROAD_PLATFORM" = "xw32" ]];
   export ARTIFACTS_SUFFIX="-x86"
 fi
 
-
+## Install the required (pre-built) packages for babl, GEGL and GIMP
-# Install the required (pre-built) packages for babl, GEGL and GIMP
 crossroad source msys2
 DEPS_LIST=$(cat build/windows/gitlab-ci/all-deps-uni.txt)
 DEPS_LIST=$(sed "s/\${MINGW_PACKAGE_PREFIX}-//g" <<< $DEPS_LIST)
 DEPS_LIST=$(sed 's/\\//g' <<< $DEPS_LIST)
-
 crossroad install $DEPS_LIST
-
 if [ $? -ne 0 ]; then
   echo "Installation of pre-built dependencies failed.";
   exit 1;
 fi
 
-
+## Clone babl and GEGL (follow master branch)
-# Clone babl and GEGL (follow master branch)
 mkdir _deps && cd _deps
 git clone --depth 1 https://gitlab.gnome.org/GNOME/babl.git _babl
 git clone --depth 1 https://gitlab.gnome.org/GNOME/gegl.git _gegl
 
-# Build babl and GEGL
+## Build babl and GEGL
 mkdir _babl/_build${ARTIFACTS_SUFFIX}-cross/ && cd _babl/_build${ARTIFACTS_SUFFIX}-cross/
 crossroad meson setup .. -Denable-gir=false
 ninja && ninja install
@@ -34,8 +46,7 @@ crossroad meson setup .. -Dintrospection=false
 ninja && ninja install
 cd ../../
 
-
+## "Build" part of deps
-# "Build" part of deps
 if [ "x$CROSSROAD_PLATFORM" = "xw64" ]; then
   ## Generator of the gio 'giomodule.cache' to fix error about
   ## libgiognutls.dll that prevents generating loaders.cache
@@ -56,3 +67,5 @@ if [ "x$CROSSROAD_PLATFORM" = "xw64" ]; then
   GLIB_PATH=$(echo ${CROSSROAD_PREFIX}/share/glib-*/schemas/)
   wine ${CROSSROAD_PREFIX}/bin/glib-compile-schemas.exe --targetdir=${GLIB_PATH} ${GLIB_PATH}
 fi
+
+fi # END OF CROSSROAD ENV