[gimp/wip/Jehan/win32-distrib-job] gitlab-ci: "needs" jobs have to be in a prior stage.

[Jehan <jehanp src gnome org>]

commit 5b809268fc08d0ab4ccd475cc0a1b44327b50d11
Author: Jehan <jehan girinstud io>
Date:   Fri Oct 2 13:21:21 2020 +0200

    gitlab-ci: "needs" jobs have to be in a prior stage.

 .gitlab-ci.yml | 28 +++++++++++++++++++---------
 1 file changed, 19 insertions(+), 9 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 45f942baa4..93b64e0484 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -209,6 +209,22 @@ deps-win64:
   script:
     - export PATH="`pwd`/.local/bin:$PATH"
     - crossroad w64 gimp --run="build/windows/crossbuild-gitlab-ci/build-deps.sh"
+
+    # Generate the loaders.cache file for GUI image support.
+    # Note: this is mostly for distribution so I wanted to have these in
+    # "win64-nightly" job but "win32-nightly" also requires the same
+    # file (and I fail to install wine32) whereas Gitlab "need" field
+    # requires jobs to be from a prior stage. So I generate this here.
+    - apt-get update
+    - apt-get install -y --no-install-recommends wine wine64
+
+    - echo 'wine ${CROSSROAD_PREFIX}/bin/gdk-pixbuf-query-loaders.exe
+                 ${CROSSROAD_PREFIX}/lib/gdk-pixbuf-2.0/2.10.0/loaders/*.dll > 
${CROSSROAD_PREFIX}/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache' |
+      crossroad w64 gimp --run="-"
+    - echo 'sed -i "s&$CROSSROAD_PREFIX/&&" ${CROSSROAD_PREFIX}/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache' |
+      crossroad w64 gimp --run="-"
+    - echo "sed -i '/.dll\"/s*/*\\\\*g' ${CROSSROAD_PREFIX}/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache" |
+      crossroad w64 gimp --run="-"
   artifacts:
     name: "${CI_JOB_NAME}-${CI_COMMIT_REF_NAME}"
     when: always
@@ -360,7 +376,6 @@ win64-nightly:
     - apt-get install -y --no-install-recommends
                       python3 binutils-mingw-w64-x86-64 file
                       libglib2.0-bin
-                      wine wine64
 
     # Package ressources.
     - mkdir -p ${GIMP_DISTRIB}
@@ -389,11 +404,6 @@ win64-nightly:
     - cp -fr ${GIMP_PREFIX}/lib/babl-0.1 ${GIMP_DISTRIB}/lib/
     - cp -fr ${GIMP_PREFIX}/lib/girepository-1.0 ${GIMP_DISTRIB}/lib/
 
-    # Generate the loaders.cache file for GUI image support.
-    - wine ${GIMP_PREFIX}/bin/gdk-pixbuf-query-loaders.exe 
${GIMP_DISTRIB}/lib/gdk-pixbuf-2.0/2.10.0/loaders/*.dll > 
${GIMP_DISTRIB}/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache
-    - sed -i "s&[A-Z]:.*/gimp/$GIMP_DISTRIB/&&" ${GIMP_DISTRIB}/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache
-    - sed -i '/.dll"/s*/*\\\\*g' ${GIMP_DISTRIB}/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache
-
     # Generate share/glib-2.0/schemas/gschemas.compiled
     - glib-compile-schemas --targetdir=${GIMP_DISTRIB}/share/glib-2.0/schemas 
${GIMP_DISTRIB}/share/glib-2.0/schemas
 
@@ -468,9 +478,9 @@ win32-nightly:
     - cp -fr ${GIMP_PREFIX}/lib/girepository-1.0 ${GIMP_DISTRIB}/lib/
 
     # I fail to install wine32 inside the Gitlab runner. So instead, I
-    # just reuse the loaders.cache generated in the win64-nightly job as
+    # just reuse the loaders.cache generated in the deps-win64 job as
     # they should be the same (text format).
-    - cp gimp-w64/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache 
${GIMP_DISTRIB}/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache
+    - cp ~/.local/share/crossroad/roads/w64/gimp/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache 
${GIMP_DISTRIB}/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache
 
     # Generate share/glib-2.0/schemas/gschemas.compiled
     - glib-compile-schemas --targetdir=${GIMP_DISTRIB}/share/glib-2.0/schemas 
${GIMP_DISTRIB}/share/glib-2.0/schemas
@@ -499,4 +509,4 @@ win32-nightly:
     - for dll in ${GIMP_DISTRIB}/lib/gimp/2.99/plug-ins/*/*.exe; do
         python3 build/windows/crossbuild-gitlab-ci/dll_link.py $dll ${GIMP_PREFIX}/ ${GIMP_DISTRIB};
       done
-  needs: ["gimp-win32", "win64-nightly"]
+  needs: ["gimp-win32", "deps-win64"]