[gimp/wip/Jehan/gitlab-ci-win-32-bit] Plop…

[Jehan <jehanp src gnome org>]

commit 87c8124135eda0b0c29e133209382932a8719968
Author: Jehan <jehan girinstud io>
Date:   Wed May 12 20:48:10 2021 +0200

    Plop…

 .gitlab-ci.yml                              | 24 ------------------------
 build/windows/gitlab-ci/build-gimp-msys2.sh | 11 +++++++++--
 2 files changed, 9 insertions(+), 26 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 1940dbbe41..b257d1c381 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -78,24 +78,6 @@ build-image-win32:
 
     - /kaniko/executor --context $CI_PROJECT_DIR --dockerfile $CI_PROJECT_DIR/Dockerfile --destination 
$CI_REGISTRY_IMAGE:build-win32-latest --cache=true --cache-ttl=120h
 
-test-innosetup:
-  variables:
-    CHERE_INVOKING: "yes"
-  tags:
-    - win32-ps
-  stage: prepare
-  artifacts:
-    name: "${CI_JOB_NAME}-${CI_COMMIT_REF_SLUG}"
-    when: always
-    expire_in: 2 days
-    paths:
-    - build/windows/installer/_Output
-    - is.exe
-    - innosetup.log
-  script:
-    - C:\msys64\usr\bin\pacman --noconfirm -Syyuu
-    - C:\msys64\usr\bin\bash -lc "bash -x ./build/windows/gitlab-ci/test-innosetup-msys2.sh"
-
 ## GNU/Linux 64-bit CIs (Debian testing) ##
 
 deps-debian:
@@ -243,11 +225,8 @@ gimp-win64-native:
   tags:
     - win32-ps
   script:
-    - mv _install-w64 ~
-    - git clean -dfx
     - C:\msys64\usr\bin\pacman --noconfirm -Syyuu
     - C:\msys64\usr\bin\bash -lc "bash -x ./build/windows/gitlab-ci/build-gimp-msys2.sh"
-    - mv ~/_install-w64 .
   artifacts:
     name: "${CI_JOB_NAME}-${CI_COMMIT_REF_SLUG}"
     when: always
@@ -292,11 +271,8 @@ gimp-win32-native:
   tags:
     - win32-ps
   script:
-    - mv _install-w32 ~
-    - git clean -dfx
     - C:\msys64\usr\bin\pacman --noconfirm -Syyuu
     - C:\msys64\usr\bin\bash -lc "bash -x ./build/windows/gitlab-ci/build-gimp-msys2.sh"
-    - mv ~/_install-w32 .
   artifacts:
     name: "${CI_JOB_NAME}-${CI_COMMIT_REF_SLUG}"
     when: always
diff --git a/build/windows/gitlab-ci/build-gimp-msys2.sh b/build/windows/gitlab-ci/build-gimp-msys2.sh
index bce6388511..cabb52305b 100644
--- a/build/windows/gitlab-ci/build-gimp-msys2.sh
+++ b/build/windows/gitlab-ci/build-gimp-msys2.sh
@@ -32,6 +32,13 @@ rm -f /c/msys64/mingw64/bin/gdk-pixbuf-pixdata.exe
 rm -f /c/msys64/mingw64/bin/libgdk_pixbuf-2.0-0.dll
 rm -f /c/msys64/mingw64/lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-png.dll
 
+# Ok so it seems that the runner is too full. I am still unsure what is
+# 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 -
+
 # Update everything
 pacman --noconfirm -Suy
 
@@ -80,7 +87,7 @@ pacman --noconfirm -S --needed \
 # 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.
-#mv "_install${ARTIFACTS_SUFFIX}" ~
+mv "_install${ARTIFACTS_SUFFIX}" ~
 
 export GIMP_PREFIX="`realpath ~/_install`${ARTIFACTS_SUFFIX}"
 export PATH="$GIMP_PREFIX/bin:$PATH"
@@ -108,4 +115,4 @@ cd ..
 ccache --show-stats
 
 # XXX Moving back the prefix to be used as artifacts.
-#mv "${GIMP_PREFIX}" .
+mv "${GIMP_PREFIX}" .