[gimp] build: some cleanup in build scripts for Windows.
- From: Jehan <jehanp src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gimp] build: some cleanup in build scripts for Windows.
- Date: Mon, 28 Jun 2021 12:50:50 +0000 (UTC)
commit 63f75471f5d0dd802613829d92e0cb505beab5c2
Author: Jehan <jehan girinstud io>
Date: Mon Jun 21 17:51:49 2021 +0200
build: some cleanup in build scripts for Windows.
We had some weird conflicting files errors in the CI. I think our weird
file removal is not needed anymore. So get rid of the ugly cleanup hack.
build/windows/gitlab-ci/build-deps-msys2.sh | 16 ----------------
build/windows/gitlab-ci/build-gimp-msys2.sh | 16 ----------------
2 files changed, 32 deletions(-)
---
diff --git a/build/windows/gitlab-ci/build-deps-msys2.sh b/build/windows/gitlab-ci/build-deps-msys2.sh
index afe82defe8..99b98dc202 100644
--- a/build/windows/gitlab-ci/build-deps-msys2.sh
+++ b/build/windows/gitlab-ci/build-deps-msys2.sh
@@ -16,22 +16,6 @@ else
export GEGL_OPTIONS=""
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
diff --git a/build/windows/gitlab-ci/build-gimp-msys2.sh b/build/windows/gitlab-ci/build-gimp-msys2.sh
index 7aff96964e..d2e43e385c 100644
--- a/build/windows/gitlab-ci/build-gimp-msys2.sh
+++ b/build/windows/gitlab-ci/build-gimp-msys2.sh
@@ -17,22 +17,6 @@ fi
export ACLOCAL_FLAGS="-I${MSYS2_PREFIX}/share/aclocal"
export PATH="${MSYS2_PREFIX}/bin:$PATH"
-# 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
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]