[gimp/wip/Jehan/gitlab-ci-win-32-bit: 5/5] Cleanup everything.

[Jehan <jehanp src gnome org>]

commit 14e59d24b72cad4d5559572d0d156f6eb30c1724
Author: Jehan <jehan girinstud io>
Date:   Fri May 14 16:31:20 2021 +0200

    Cleanup everything.
    
    To be merged back with 5fceedaedd93d7837789649a86663e45d40bebac

 .gitlab-ci.yml                                  | 20 --------------------
 build/windows/gitlab-ci/build-gimp-msys2.sh     | 20 ++++----------------
 build/windows/gitlab-ci/installer-gimp-msys2.sh | 12 ++++++++----
 build/windows/gitlab-ci/package-gimp-msys2.sh   | 15 ++++-----------
 build/windows/gitlab-ci/test-innosetup-msys2.sh | 10 ----------
 5 files changed, 16 insertions(+), 61 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 49d8ddfff8..eb88554b88 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -13,24 +13,6 @@ variables:
   INSTALL_PREFIX: "${CI_PROJECT_DIR}/${INSTALL_DIR}"
   APT_CACHE: "${CI_PROJECT_DIR}/apt-cache"
 
-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"
-
 ## prepare docker images ##
 
 build-image:
@@ -252,7 +234,6 @@ gimp-win64-native:
     paths:
     - _install-w64
     - build/windows/installer/lang/
-    #- _build-w64
   cache:
     paths:
     - _ccache/
@@ -298,7 +279,6 @@ gimp-win32-native:
     expire_in: 1 day
     paths:
     - _install-w32
-    #- _build-w32
   cache:
     paths:
     - _ccache/
diff --git a/build/windows/gitlab-ci/build-gimp-msys2.sh b/build/windows/gitlab-ci/build-gimp-msys2.sh
index 13998f5808..42ae685b08 100644
--- a/build/windows/gitlab-ci/build-gimp-msys2.sh
+++ b/build/windows/gitlab-ci/build-gimp-msys2.sh
@@ -32,17 +32,11 @@ 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
 
-export PACKAGES=" \
+# Install the required packages
+pacman --noconfirm -S --needed \
     base-devel \
     mingw-w64-$MSYS2_ARCH-toolchain \
     mingw-w64-$MSYS2_ARCH-ccache \
@@ -77,14 +71,11 @@ export PACKAGES=" \
     mingw-w64-$MSYS2_ARCH-pango \
     mingw-w64-$MSYS2_ARCH-poppler \
     mingw-w64-$MSYS2_ARCH-poppler-data \
-    mingw-w64-$MSYS2_ARCH-python-gobject \
+    mingw-w64-$MSYS2_ARCH-python3-gobject \
     mingw-w64-$MSYS2_ARCH-shared-mime-info \
     mingw-w64-$MSYS2_ARCH-suitesparse \
     mingw-w64-$MSYS2_ARCH-vala \
-    mingw-w64-$MSYS2_ARCH-xpm-nox"
-
-# Install the required packages
-pacman --noconfirm -S --needed ${PACKAGES}
+    mingw-w64-$MSYS2_ARCH-xpm-nox
 
 # 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
@@ -118,6 +109,3 @@ 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 ${PACKAGES}
diff --git a/build/windows/gitlab-ci/installer-gimp-msys2.sh b/build/windows/gitlab-ci/installer-gimp-msys2.sh
index 7f0a3b4d3d..8ac89e6645 100644
--- a/build/windows/gitlab-ci/installer-gimp-msys2.sh
+++ b/build/windows/gitlab-ci/installer-gimp-msys2.sh
@@ -1,13 +1,15 @@
+# Install Inno Setup.
 wget https://jrsoftware.org/download.php/is.exe
-#./is.exe //VERYSILENT //SUPPRESSMSGBOXES //ALLUSERS //LOG="innosetup.log"
 ./is.exe //SILENT //SUPPRESSMSGBOXES //CURRENTUSER //SP- //LOG="innosetup.log"
+
+# Install unofficial language files. These are translations of "unknown
+# translation quality or might not be maintained actively".
+# Cf. https://jrsoftware.org/files/istrans/
 ISCCDIR=`grep "Dest filename:.*ISCC.exe" innosetup.log | sed 's/.*Dest filename: *\|ISCC.exe//g'`
-echo "Inno Setup installed in $ISCCDIR"
 ISCCDIR=`cygpath -u "$ISCCDIR"`
-echo "Inno Setup installed in $ISCCDIR"
-ls "$ISCCDIR"
 mkdir -p "${ISCCDIR}/Languages/Unofficial"
 cd "${ISCCDIR}/Languages/Unofficial"
+
 wget https://raw.githubusercontent.com/jrsoftware/issrc/main/Files/Languages/Unofficial/Basque.isl
 wget https://raw.githubusercontent.com/jrsoftware/issrc/main/Files/Languages/Unofficial/ChineseSimplified.isl
 wget 
https://raw.githubusercontent.com/jrsoftware/issrc/main/Files/Languages/Unofficial/ChineseTraditional.isl
@@ -24,5 +26,7 @@ wget https://raw.githubusercontent.com/jrsoftware/issrc/main/Files/Languages/Uno
 wget https://raw.githubusercontent.com/jrsoftware/issrc/main/Files/Languages/Unofficial/Swedish.isl
 wget https://raw.githubusercontent.com/jrsoftware/issrc/main/Files/Languages/Unofficial/Vietnamese.isl
 cd -
+
+# Construct now the installer.
 cd build/windows/installer
 ./compile.bat 2.99.6 ../../.. gimp-w32 gimp-w64 ../../.. gimp-w32 gimp-w64
diff --git a/build/windows/gitlab-ci/package-gimp-msys2.sh b/build/windows/gitlab-ci/package-gimp-msys2.sh
index 8bc8364a60..a400bc60e8 100644
--- a/build/windows/gitlab-ci/package-gimp-msys2.sh
+++ b/build/windows/gitlab-ci/package-gimp-msys2.sh
@@ -2,8 +2,6 @@
 
 set -e
 
-echo "MSYSTEM: '$MSYSTEM'"
-
 if [[ "$MSYSTEM" == "MINGW32" ]]; then
     export ARTIFACTS_SUFFIX="-w32"
     export MSYS2_ARCH="i686"
@@ -37,7 +35,8 @@ rm -f /c/msys64/mingw64/lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-png.dl
 # Update everything
 pacman --noconfirm -Suy
 
-export PACKAGES=" \
+# Install the required packages
+pacman --noconfirm -S --needed ${PACKAGES}
     base-devel \
     mingw-w64-$MSYS2_ARCH-binutils \
     mingw-w64-$MSYS2_ARCH-toolchain \
@@ -73,14 +72,11 @@ export PACKAGES=" \
     mingw-w64-$MSYS2_ARCH-pango \
     mingw-w64-$MSYS2_ARCH-poppler \
     mingw-w64-$MSYS2_ARCH-poppler-data \
-    mingw-w64-$MSYS2_ARCH-python-gobject \
+    mingw-w64-$MSYS2_ARCH-python3-gobject \
     mingw-w64-$MSYS2_ARCH-shared-mime-info \
     mingw-w64-$MSYS2_ARCH-suitesparse \
     mingw-w64-$MSYS2_ARCH-vala \
-    mingw-w64-$MSYS2_ARCH-xpm-nox"
-
-# Install the required packages
-pacman --noconfirm -S --needed ${PACKAGES}
+    mingw-w64-$MSYS2_ARCH-xpm-nox
 
 export GIMP_PREFIX="`realpath ./_install`${ARTIFACTS_SUFFIX}"
 export PATH="$GIMP_PREFIX/bin:$PATH"
@@ -219,6 +215,3 @@ for dll in ${GIMP_DISTRIB}/lib/gimp/2.99/plug-ins/*/*.exe; do
   python3 build/windows/gitlab-ci/dll_link.py $dll ${GIMP_PREFIX}/ ${GIMP_DISTRIB};
   python3 build/windows/gitlab-ci/dll_link.py $dll ${MSYS_PREFIX}/ ${GIMP_DISTRIB};
 done
-
-# Uninstall the packages to avoid disk space issues in the CI.
-#pacman --noconfirm --remove ${PACKAGES}