Merge branch 'release/1.1.17'

lueschem · Dec 16, 2019 · abca4d4 · abca4d4
2 parents 256d46f + 1b49241
commit abca4d4
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 7 deletions.
diff --git a/debian/changelog b/debian/changelog
@@ -1,3 +1,10 @@
+edi (1.1.17) bionic; urgency=medium
+
+  [ Matthias Lüscher ]
+  * Silence build output.
+
+ -- Matthias Luescher <lueschem@gmail.com>  Mon, 16 Dec 2019 18:30:46 +0100
+
 edi (1.1.16) bionic; urgency=medium
 
   [ Matthias Lüscher ]

diff --git a/docs/conf.py b/docs/conf.py
@@ -55,8 +55,8 @@
 # built documents.
 #
 # The short X.Y version.
-version = '1.1.16'
-release = '1.1.16'
+version = '1.1.17'
+release = '1.1.17'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

diff --git a/edi/lib/versionhelpers.py b/edi/lib/versionhelpers.py
@@ -26,7 +26,7 @@
 
 # The do_release script will update this version!
 # During launchpad debuild neither the git version nor the package version is available.
-edi_fallback_version = '1.1.16'
+edi_fallback_version = '1.1.17'
 
 
 def get_edi_version():

diff --git a/setup.py b/setup.py
@@ -38,7 +38,7 @@
 setup(
     name='edi',
 
-    version='1.1.16',
+    version='1.1.17',
 
     description='Embedded Development Infrastructure - edi',
     long_description=long_description,

diff --git a/travis/travis-build b/travis/travis-build
@@ -87,13 +87,13 @@ sudo -u ${TESTUSER} git add debian/changelog
 sudo -u ${TESTUSER} git commit -m "New version ${NEW_VERSION}."
 sudo -u ${TESTUSER} git tag -a v${NEW_VERSION} -m "New version ${NEW_VERSION}."
 
-mk-build-deps -i debian/control -t "apt-get -y"
+mk-build-deps -i debian/control -t "apt-get -y" > /dev/null
 
 sudo -u ${TESTUSER} py.test-3
 
 sudo -u ${TESTUSER} git clean -dxf
 
-sudo -u ${TESTUSER} debuild -us -uc
+sudo -u ${TESTUSER} debuild -us -uc > /dev/null
 
 dpkg -i ../edi_*_all.deb || true
 apt-get -y --no-install-recommends install -f
@@ -131,7 +131,7 @@ then
     GPG_KEY_PASSPHRASE="${CONTAINER_WORK}/travis/travis-key.passphrase"
     gpg ${GPG_OPTIONS} --passphrase-file ${GPG_KEY_PASSPHRASE} --import ${GPG_KEY}
 
-    sudo -u ${TESTUSER} debuild -S -us -uc    
+    sudo -u ${TESTUSER} debuild -S -us -uc > /dev/null
 
     RESULT="${CONTAINER_WORK}/../edi_${NEW_VERSION}_source.changes"
     debsign -p"gpg ${GPG_OPTIONS} --passphrase-file ${GPG_KEY_PASSPHRASE}" -S -kB6D5610F601C6B6E4A880C93AA6945FE5AAFB25D ${RESULT}