mirror of
https://gitlab.gnome.org/GNOME/gimp.git
synced 2025-07-04 01:43:24 +00:00
Revert "gitlab-ci, build/windows: Try to fix Debian Testing 'apt'"
This reverts commit b6fb472ae2
.
We need to always have apt output since Debian Testing is tricky.
This commit is contained in:
parent
135935c448
commit
41b3dfb70f
2 changed files with 3 additions and 4 deletions
|
@ -457,7 +457,6 @@ gimp-flatpak-x64:
|
||||||
- if: '$GIMP_CI_CROSSROAD_WIN64 != null'
|
- if: '$GIMP_CI_CROSSROAD_WIN64 != null'
|
||||||
variables:
|
variables:
|
||||||
DEB_VERSION: testing
|
DEB_VERSION: testing
|
||||||
DEBIAN_FRONTEND: noninteractive
|
|
||||||
MSYSTEM_PREFIX: clang64
|
MSYSTEM_PREFIX: clang64
|
||||||
cache: []
|
cache: []
|
||||||
|
|
||||||
|
|
|
@ -25,11 +25,11 @@ fi
|
||||||
## Install quasi-msys2 and its deps
|
## Install quasi-msys2 and its deps
|
||||||
# Beginning of install code block
|
# Beginning of install code block
|
||||||
if [ "$GITLAB_CI" ]; then
|
if [ "$GITLAB_CI" ]; then
|
||||||
apt-get update -y &> apt.log || cat apt.log
|
apt-get update -y
|
||||||
apt-get install -y --no-install-recommends \
|
apt-get install -y --no-install-recommends \
|
||||||
clang \
|
clang \
|
||||||
lld \
|
lld \
|
||||||
llvm &>> apt.log || cat apt.log
|
llvm
|
||||||
apt-get install -y --no-install-recommends \
|
apt-get install -y --no-install-recommends \
|
||||||
gawk \
|
gawk \
|
||||||
gpg \
|
gpg \
|
||||||
|
@ -37,7 +37,7 @@ if [ "$GITLAB_CI" ]; then
|
||||||
sudo \
|
sudo \
|
||||||
tar \
|
tar \
|
||||||
wget \
|
wget \
|
||||||
zstd &>> apt.log | rm apt.log || cat apt.log
|
zstd
|
||||||
fi
|
fi
|
||||||
# End of install code block
|
# End of install code block
|
||||||
if [ ! -d 'quasi-msys2' ]; then
|
if [ ! -d 'quasi-msys2' ]; then
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue