[gimp/wip/Jehan/incremental-win-installer-improvements] Test.



commit d96afee82e99c825ba6b77101caad1ea08ce2c7b
Author: Jehan <jehan girinstud io>
Date:   Fri May 21 17:23:31 2021 +0200

    Test.

 build/windows/gitlab-ci/package-gimp-msys2.sh | 17 +----------------
 1 file changed, 1 insertion(+), 16 deletions(-)
---
diff --git a/build/windows/gitlab-ci/package-gimp-msys2.sh b/build/windows/gitlab-ci/package-gimp-msys2.sh
index eb5acf06e1..7799a3b62a 100644
--- a/build/windows/gitlab-ci/package-gimp-msys2.sh
+++ b/build/windows/gitlab-ci/package-gimp-msys2.sh
@@ -16,22 +16,6 @@ else
     export GIMP_DISTRIB=`realpath ./gimp-w64`
 fi
 
-# Why do we even have to remove these manually? The whole thing is
-# messed up, but it looks like the Gitlab runner fails to clean properly
-# (it spews a bunch of "failed to remove" warnings at runner start, then
-# ends with a "error: failed to commit transaction (conflicting files)"
-# listing the various files it failed to remove).
-# Might be tied to: https://gitlab.com/gitlab-org/gitlab-runner/-/issues/1839
-rm -f /c/msys64/mingw64/bin/libpcre-1.dll
-rm -f /c/msys64/mingw64/bin/libgio-2.0-0.dll
-rm -f /c/msys64/mingw64/bin/libglib-2.0-0.dll
-rm -f /c/msys64/mingw64/bin/libgmodule-2.0-0.dll
-rm -f /c/msys64/mingw64/bin/libgobject-2.0-0.dll
-rm -f /c/msys64/mingw64/bin/libpng16-16.dll
-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
-
 # Update everything
 pacman --noconfirm -Suy
 
@@ -48,6 +32,7 @@ pacman --noconfirm -S --needed \
     mingw-w64-$MSYS2_ARCH-drmingw \
     mingw-w64-$MSYS2_ARCH-gexiv2 \
     mingw-w64-$MSYS2_ARCH-ghostscript \
+    mingw-w64-$MSYS2_ARCH-glib2 \
     mingw-w64-$MSYS2_ARCH-glib-networking \
     mingw-w64-$MSYS2_ARCH-gobject-introspection \
     mingw-w64-$MSYS2_ARCH-gobject-introspection-runtime \


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