summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOtto Kekäläinen <otto@kekalainen.net>2020-03-16 13:07:52 +0200
committerVicențiu-Marian Ciorbaru <vicentiu@mariadb.org>2020-03-18 22:49:55 +0200
commit41952c85f1644690249ce624de7609cbebb93638 (patch)
tree9e65632c242c59e1c24245515b4ec077b6f8bb13
parent30b44aaec7120f41ee1383536730947cfa427308 (diff)
downloadmariadb-git-41952c85f1644690249ce624de7609cbebb93638.tar.gz
Travis-CI: Shorten deb build log to keep it under 4 MB
There is a 4 MB hard limit on Travis-CI and build output needs to be less than that. Silencing the 'make install' step gets rid of a lot of "Installing.." and "Missing.." and removing all mysql-test files will make the dh_missing warnings much shorter.
-rwxr-xr-xdebian/rules9
1 files changed, 7 insertions, 2 deletions
diff --git a/debian/rules b/debian/rules
index ab24e9f7638..d1514215f6b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -117,8 +117,13 @@ ifneq (,$(filter linux,$(DEB_HOST_ARCH_OS)))
cp $(BUILDDIR)/support-files/mariadb@.service debian/mariadb-server-10.5.mariadb@.service
endif
- # make install
- cd $(BUILDDIR) && $(MAKE) install DESTDIR=$(TMP)
+ # Run 'make install' without output since it is uninteresting and
+ # silencing it helps to make overall build log shorter and more readable
+ @echo "Running $(MAKE) install DESTDIR=$(TMP) ..."
+ cd $(BUILDDIR) && $(MAKE) install DESTDIR=$(TMP) > /dev/null
+
+ # If mariadb-test package is removed, also remove most of it's files
+ grep --quiet "Package: mariadb-test" debian/control || rm -rf $(TMP)/usr/share/mysql/mysql-test
# Delete runnable files we don't want to have in the test data package.
# This avoids triggering multiple Lintian errors.