From b6fb472ae2ae7f491674eee72e3d413bd3acf854 Mon Sep 17 00:00:00 2001 From: Bruno Date: Tue, 14 Jan 2025 13:01:21 -0300 Subject: [PATCH] gitlab-ci, build/windows: Try to fix Debian Testing 'apt' --- .gitlab-ci.yml | 1 + build/windows/1_build-deps-quasimsys2.sh | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 11cb54a036..10e76b3db8 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -457,6 +457,7 @@ gimp-flatpak-x64: - if: '$GIMP_CI_CROSSROAD_WIN64 != null' variables: DEB_VERSION: testing + DEBIAN_FRONTEND: noninteractive MSYSTEM_PREFIX: clang64 cache: [] diff --git a/build/windows/1_build-deps-quasimsys2.sh b/build/windows/1_build-deps-quasimsys2.sh index d0244f3c4f..99df89b06a 100644 --- a/build/windows/1_build-deps-quasimsys2.sh +++ b/build/windows/1_build-deps-quasimsys2.sh @@ -25,11 +25,11 @@ fi ## Install quasi-msys2 and its deps # Beginning of install code block if [ "$GITLAB_CI" ]; then - apt-get update -y >/dev/null + apt-get update -y &> apt.log || cat apt.log apt-get install -y --no-install-recommends \ clang \ lld \ - llvm >/dev/null + llvm &>> apt.log || cat apt.log apt-get install -y --no-install-recommends \ gawk \ gpg \ @@ -37,7 +37,7 @@ if [ "$GITLAB_CI" ]; then sudo \ tar \ wget \ - zstd >/dev/null + zstd &>> apt.log | rm apt.log || cat apt.log fi # End of install code block if [ ! -d 'quasi-msys2' ]; then