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




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

    WIP.

 build/windows/gitlab-ci/build-gimp-msys2.sh | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)
---
diff --git a/build/windows/gitlab-ci/build-gimp-msys2.sh b/build/windows/gitlab-ci/build-gimp-msys2.sh
index cabb52305b..107a8647b0 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 \
@@ -84,6 +83,9 @@ pacman --noconfirm -S --needed \
     mingw-w64-$MSYS2_ARCH-vala \
     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
 # completely ridiculous.
@@ -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}


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]