[gimp/wip/Jehan/gitlab-ci-win-32-bit] Investigating Win 32-bit build!

[Jehan <jehanp src gnome org>]

commit 6e741e31a10cfc88951dc70471ac9848d5c29db3
Author: Jehan <jehan girinstud io>
Date:   Sat May 8 20:12:06 2021 +0200

    Investigating Win 32-bit build!

 .gitlab-ci.yml                              |  2 ++
 build/windows/gitlab-ci/build-gimp-msys2.sh | 26 ++++++++++++++++----------
 2 files changed, 18 insertions(+), 10 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 1bae9d05ca..dde74f710d 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -237,6 +237,7 @@ gimp-win64-native:
     expire_in: 1 day
     paths:
     - _install
+    - _build
   cache:
     paths:
     - _ccache/
@@ -285,6 +286,7 @@ gimp-win32-native:
     expire_in: 1 day
     paths:
     - _install
+    - _build
   cache:
     paths:
     - _ccache/
diff --git a/build/windows/gitlab-ci/build-gimp-msys2.sh b/build/windows/gitlab-ci/build-gimp-msys2.sh
index 0ffb8a837c..6b8685c399 100644
--- a/build/windows/gitlab-ci/build-gimp-msys2.sh
+++ b/build/windows/gitlab-ci/build-gimp-msys2.sh
@@ -4,8 +4,12 @@ set -e
 
 if [[ "$MSYSTEM" == "MINGW32" ]]; then
     export MSYS2_ARCH="i686"
+    export ACLOCAL_FLAGS="-I/c/msys64/mingw32/share/aclocal"
+    export PATH="/c/msys64/mingw32/bin:$PATH"
 else
     export MSYS2_ARCH="x86_64"
+    export ACLOCAL_FLAGS="-I/c/msys64/mingw64/share/aclocal"
+    export PATH="/c/msys64/mingw64/bin:$PATH"
 fi
 
 # Why do we even have to remove these manually? The whole thing is
@@ -31,7 +35,7 @@ pacman --noconfirm -Suy
 pacman --noconfirm -S --needed \
     base-devel \
     mingw-w64-$MSYS2_ARCH-toolchain \
-    mingw-w64-$MSYS2_ARCH-ccache \
+    #mingw-w64-$MSYS2_ARCH-ccache \
     \
     mingw-w64-$MSYS2_ARCH-appstream-glib \
     mingw-w64-$MSYS2_ARCH-atk \
@@ -79,22 +83,24 @@ export PATH="$GIMP_PREFIX/bin:$PATH"
 export PKG_CONFIG_PATH="${GIMP_PREFIX}/lib/pkgconfig:$PKG_CONFIG_PATH"
 export PKG_CONFIG_PATH="${GIMP_PREFIX}/share/pkgconfig:$PKG_CONFIG_PATH"
 export LD_LIBRARY_PATH="${GIMP_PREFIX}/lib:${LD_LIBRARY_PATH}"
-export ACLOCAL_FLAGS="-I/c/msys64/mingw64/share/aclocal"
+export ACLOCAL_FLAGS="-I/c/msys64/mingw32/share/aclocal"
 export XDG_DATA_DIRS="${GIMP_PREFIX}/share:/mingw64/share/"
 
-mkdir -p _ccache
-export CCACHE_BASEDIR="$(pwd)"
-export CCACHE_DIR="${CCACHE_BASEDIR}/_ccache"
-export CC="ccache gcc"
+#mkdir -p _ccache
+#export CCACHE_BASEDIR="$(pwd)"
+#export CCACHE_DIR="${CCACHE_BASEDIR}/_ccache"
+#export CC="ccache gcc"
 
-ccache --zero-stats
-ccache --show-stats
+#ccache --zero-stats
+#ccache --show-stats
 
-./autogen.sh --prefix="${GIMP_PREFIX}"
+mkdir _build
+cd _build
+./autogen.sh --prefix="${GIMP_PREFIX}" ..
 make -j4
 make install
 
-ccache --show-stats
+#ccache --show-stats
 
 # XXX Moving back the prefix to be used as artifacts.
 mv "${GIMP_PREFIX}" .