[gimp/wip/Jehan/shorter-distcheck] gitlab-ci: move pygtk build into deps-debian/testing step.

[Jehan <jehanp src gnome org>]

commit 91db0bfd99703da0e5c23856f9a3ae3a33778af7
Author: Jehan <jehan girinstud io>
Date:   Thu Aug 6 01:14:27 2020 +0200

    gitlab-ci: move pygtk build into deps-debian/testing step.
    
    This will make Python plug-in available for the main build step.
    Also it should make the distcheck step shorter, hence hopefully will
    prevent it from timing out so often.

 .gitlab-ci.yml | 64 +++++++++++++++++++++++++++++-----------------------------
 1 file changed, 32 insertions(+), 32 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 8e91cf458f..249bf33c57 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -42,10 +42,15 @@ deps-debian/testing:
         libspiro-dev
         libsuitesparse-dev
         libtiff5-dev
+        libtool
         luajit
+        m4
         meson
+        python2
         python3
+        python-dev
         valac
+        wget
     - apt-get install -y --reinstall ca-certificates
     - git clone --depth=${GIT_DEPTH} https://gitlab.gnome.org/GNOME/babl.git _babl
     - git clone --depth=${GIT_DEPTH} https://gitlab.gnome.org/GNOME/gegl.git _gegl
@@ -63,6 +68,33 @@ deps-debian/testing:
     - meson --prefix="${INSTALL_PREFIX}" _build
     - ninja -C _build
     - ninja -C _build install
+    # Building pygtk2 as it is not available in Debian testing anymore.
+    - cd ../build/gitlab-ci
+    - wget https://cairographics.org/releases/py2cairo-1.10.0.tar.bz2
+    - wget https://download.gnome.org/sources/pygobject/2.28/pygobject-2.28.7.tar.xz
+    - wget https://download.gnome.org/sources/pygtk/2.24/pygtk-2.24.0.tar.gz
+    - sha256sum -c deps.sha256sum
+    - export PYTHON=/usr/bin/python2
+    # py2cairo
+    - tar xjf py2cairo-1.10.0.tar.bz2
+    - cd py2cairo-1.10.0/
+    - libtoolize --force
+    - aclocal
+    - autoheader
+    - automake --force-missing --add-missing --foreign
+    - autoconf
+    - ./configure --prefix="${INSTALL_PREFIX}" && make && make install
+    - cd ..
+    # pygobject
+    - tar xf pygobject-2.28.7.tar.xz
+    - cd pygobject-2.28.7/
+    - ./configure --prefix="${INSTALL_PREFIX}" && make && make install
+    - cd ..
+    # pygtk
+    - tar xzf pygtk-2.24.0.tar.gz
+    - cd pygtk-2.24.0/
+    - patch -p1 < ../pygtk-Drop-the-PangoFont-find_shaper-virtual-method.patch
+    - ./configure --prefix="${INSTALL_PREFIX}" && make && make install
 
 .gimp-debian/testing-base:
   stage: gimp
@@ -119,9 +151,6 @@ deps-debian/testing:
         meson
         mypaint-brushes
         poppler-data
-        python2
-        python-dev
-        wget
         xauth
         xvfb
     - export PKG_CONFIG_PATH="${INSTALL_PREFIX}/lib/pkgconfig:${INSTALL_PREFIX}/share/pkgconfig"
@@ -141,41 +170,12 @@ gimp-debian/testing-autotools:
     - ../autogen.sh
         --prefix="${INSTALL_PREFIX}"
         --enable-debug
-        --disable-python
     - make -j "$(nproc)"
     - make check
 
 gimp-debian/testing-autotools-distcheck:
   extends: .gimp-debian/testing-base
   script:
-    # Building pygtk2 as it is not available in Debian testing anymore.
-    - cd build/gitlab-ci
-    - wget https://cairographics.org/releases/py2cairo-1.10.0.tar.bz2
-    - wget https://download.gnome.org/sources/pygobject/2.28/pygobject-2.28.7.tar.xz
-    - wget https://download.gnome.org/sources/pygtk/2.24/pygtk-2.24.0.tar.gz
-    - sha256sum -c deps.sha256sum
-    - export PYTHON=/usr/bin/python2
-    # py2cairo
-    - tar xjf py2cairo-1.10.0.tar.bz2
-    - cd py2cairo-1.10.0/
-    - libtoolize --force
-    - aclocal
-    - autoheader
-    - automake --force-missing --add-missing --foreign
-    - autoconf
-    - ./configure --prefix="${INSTALL_PREFIX}" && make && make install
-    - cd ..
-    # pygobject
-    - tar xf pygobject-2.28.7.tar.xz
-    - cd pygobject-2.28.7/
-    - ./configure --prefix="${INSTALL_PREFIX}" && make && make install
-    - cd ..
-    # pygtk
-    - tar xzf pygtk-2.24.0.tar.gz
-    - cd pygtk-2.24.0/
-    - patch -p1 < ../pygtk-Drop-the-PangoFont-find_shaper-virtual-method.patch
-    - ./configure --prefix="${INSTALL_PREFIX}" && make && make install
-    - cd ../../..
     # Actual build.
     - mkdir _build
     - cd _build