From 41b3dfb70f4a35eba16ebb4516890fd0b7e45047 Mon Sep 17 00:00:00 2001 From: Bruno Date: Wed, 15 Jan 2025 06:15:24 -0300 Subject: [PATCH] Revert "gitlab-ci, build/windows: Try to fix Debian Testing 'apt'" This reverts commit b6fb472ae2ae7f491674eee72e3d413bd3acf854. We need to always have apt output since Debian Testing is tricky. --- .gitlab-ci.yml | 1 - build/windows/1_build-deps-quasimsys2.sh | 6 +++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 10e76b3db8..11cb54a036 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -457,7 +457,6 @@ 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 99df89b06a..c3ef196f83 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 &> apt.log || cat apt.log + apt-get update -y apt-get install -y --no-install-recommends \ clang \ lld \ - llvm &>> apt.log || cat apt.log + llvm apt-get install -y --no-install-recommends \ gawk \ gpg \ @@ -37,7 +37,7 @@ if [ "$GITLAB_CI" ]; then sudo \ tar \ wget \ - zstd &>> apt.log | rm apt.log || cat apt.log + zstd fi # End of install code block if [ ! -d 'quasi-msys2' ]; then