From 9e2cbb995ebc970bba37dc631e1e369d4dcdbeac Mon Sep 17 00:00:00 2001
From: Gerald Combs <gerald@wireshark.org>
Date: Wed, 9 Sep 2020 13:20:46 -0700
Subject: GitLab CI: Set MAKEFLAGS=--silent

Set MAKEFLAGS=--silent in order to reduce the size of our log output.
---
 .gitlab-ci.yml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index fa65347f88..776e0bf711 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -31,6 +31,8 @@
     - export CCACHE_DIR=${PWD}/ccache
     - ccache --show-stats
     - export DEB_BUILD_OPTIONS=nocheck
+    - export DH_QUIET=1
+    - export MAKEFLAGS=--silent
     - mkdir build
     - cd build
   script:
@@ -127,7 +129,7 @@ build:debian-stable:
   script:
     # Shared GitLab runners limit the log size to 4M, so reduce verbosity. See
     # https://gitlab.com/gitlab-com/support-forum/issues/2790
-    - DH_QUIET=1 dpkg-buildpackage -b --no-sign -jauto
+    - dpkg-buildpackage -b --no-sign -jauto
     - mkdir debian-packages
     - mv ../*.deb debian-packages/
   artifacts:
@@ -159,7 +161,7 @@ merge-request:ubuntu-dpkg:
     - cd ..
     - bash ./tools/pre-commit 'HEAD^1'
     - sh -c '[ ! -e tools/validate-commit.py ] || tools/validate-commit.py'
-    - DH_QUIET=1 CC=/usr/lib/ccache/gcc CXX=/usr/lib/ccache/g++ dpkg-buildpackage -us -uc -rfakeroot -jauto -Zgzip -zfast
+    - CC=/usr/lib/ccache/gcc CXX=/usr/lib/ccache/g++ dpkg-buildpackage -us -uc -rfakeroot -jauto -Zgzip -zfast
     - lintian --suppress-tags library-not-linked-against-libc --display-experimental --display-info --pedantic --profile debian
 
 merge-request:ubuntu-gcc-ctest:
-- 
cgit v1.2.3