[gimp/wip/Jehan/gitlab-ci-win-32-bit: 13/14] WIP.

[Jehan <jehanp src gnome org>]

commit 22fb1e6bd7948814a175ea096ae54a1c5db476ba
Author: Jehan <jehan girinstud io>
Date:   Wed May 12 22:05:01 2021 +0200

    WIP.

 build/windows/gitlab-ci/build-gimp-msys2.sh   | 15 ++++++++++-----
 build/windows/gitlab-ci/package-gimp-msys2.sh |  4 ++--
 2 files changed, 12 insertions(+), 7 deletions(-)
---
diff --git a/build/windows/gitlab-ci/build-gimp-msys2.sh b/build/windows/gitlab-ci/build-gimp-msys2.sh
index cabb52305b..75d0236135 100644
--- a/build/windows/gitlab-ci/build-gimp-msys2.sh
+++ b/build/windows/gitlab-ci/build-gimp-msys2.sh
@@ -36,14 +36,13 @@ rm -f /c/msys64/mingw64/lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-png.dl
 # the re-usage logics of runners. Are they just re-used as-is between
 # projects? Do we have to remove installed package ourselves?
 # This trick of removing installed packages comes from Archlinux wiki.
-pacman -D --asdeps $(pacman -Qqe)
-pacman -Qtdq | pacman -Rns -
+#pacman -D --asdeps $(pacman -Qqe)
+#pacman -Qtdq | pacman -Rns -
 
 # Update everything
 pacman --noconfirm -Suy
 
-# Install the required packages
-pacman --noconfirm -S --needed \
+export PACKAGES=" \
     base-devel \
     mingw-w64-$MSYS2_ARCH-toolchain \
     mingw-w64-$MSYS2_ARCH-ccache \
@@ -82,7 +81,10 @@ pacman --noconfirm -S --needed \
     mingw-w64-$MSYS2_ARCH-shared-mime-info \
     mingw-w64-$MSYS2_ARCH-suitesparse \
     mingw-w64-$MSYS2_ARCH-vala \
-    mingw-w64-$MSYS2_ARCH-xpm-nox
+    mingw-w64-$MSYS2_ARCH-xpm-nox"
+
+# Install the required packages
+pacman --noconfirm -S --needed ${PACKAGES}
 
 # XXX We've got a weird error when the prefix is in the current dir.
 # Until we figure it out, this trick seems to work, even though it's
@@ -116,3 +118,6 @@ ccache --show-stats
 
 # XXX Moving back the prefix to be used as artifacts.
 mv "${GIMP_PREFIX}" .
+
+# Uninstall the packages to avoid disk space issues in the CI.
+pacman --noconfirm --remove -S ${PACKAGES}
diff --git a/build/windows/gitlab-ci/package-gimp-msys2.sh b/build/windows/gitlab-ci/package-gimp-msys2.sh
index 33a3d04524..e3e2dc6ce9 100644
--- a/build/windows/gitlab-ci/package-gimp-msys2.sh
+++ b/build/windows/gitlab-ci/package-gimp-msys2.sh
@@ -37,7 +37,7 @@ rm -f /c/msys64/mingw64/lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-png.dl
 # Update everything
 pacman --noconfirm -Suy
 
-export PACKAGES=\
+export PACKAGES=" \
     base-devel \
     mingw-w64-$MSYS2_ARCH-binutils \
     mingw-w64-$MSYS2_ARCH-toolchain \
@@ -77,7 +77,7 @@ export PACKAGES=\
     mingw-w64-$MSYS2_ARCH-shared-mime-info \
     mingw-w64-$MSYS2_ARCH-suitesparse \
     mingw-w64-$MSYS2_ARCH-vala \
-    mingw-w64-$MSYS2_ARCH-xpm-nox
+    mingw-w64-$MSYS2_ARCH-xpm-nox"
 
 # Install the required packages
 pacman --noconfirm -S --needed ${PACKAGES}