From 31dc8e18ff90489804747de8ef5e111da9d74b29 Mon Sep 17 00:00:00 2001 From: Javier Serrano Polo Date: Mon, 25 Feb 2019 03:53:05 +0100 Subject: [PATCH] Test deployment preparation in regular builds (#4847) Tests whether contributions break packaging inadvertently --- .travis.yml | 2 -- .travis/linux..script.sh | 5 ++++- .travis/linux.win32.script.sh | 2 ++ .travis/linux.win64.script.sh | 2 ++ .travis/osx..script.sh | 5 ++++- 5 files changed, 12 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index c48186fa3..fb0325a0d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -35,8 +35,6 @@ script: - . ${TRAVIS_BUILD_DIR}/.travis/${TRAVIS_OS_NAME}.${TARGET_OS}.script.sh after_script: - ccache -s -before_deploy: - - if [ "$TARGET_OS" != debian-sid ]; then make package; fi deploy: provider: releases api_key: diff --git a/.travis/linux..script.sh b/.travis/linux..script.sh index a68620483..8f3b763d3 100644 --- a/.travis/linux..script.sh +++ b/.travis/linux..script.sh @@ -7,8 +7,11 @@ if [ $QT5 ]; then source /opt/qt59/bin/qt59-env.sh fi -cmake -DUSE_WERROR=ON $CMAKE_FLAGS .. +cmake -DCMAKE_INSTALL_PREFIX=../target/ -DUSE_WERROR=ON $CMAKE_FLAGS .. make -j4 make tests ./tests/tests + +make install +make appimage diff --git a/.travis/linux.win32.script.sh b/.travis/linux.win32.script.sh index eb7cb9f7a..1ef063d55 100644 --- a/.travis/linux.win32.script.sh +++ b/.travis/linux.win32.script.sh @@ -6,3 +6,5 @@ export CMAKE_OPTS="$CMAKE_FLAGS -DUSE_WERROR=ON" ../cmake/build_mingw32.sh make -j4 + +make package diff --git a/.travis/linux.win64.script.sh b/.travis/linux.win64.script.sh index fb62cb5b3..b99a461de 100644 --- a/.travis/linux.win64.script.sh +++ b/.travis/linux.win64.script.sh @@ -6,3 +6,5 @@ export CMAKE_OPTS="$CMAKE_FLAGS -DUSE_WERROR=ON" ../cmake/build_mingw64.sh make -j4 + +make package diff --git a/.travis/osx..script.sh b/.travis/osx..script.sh index fb1473f79..58df3b624 100644 --- a/.travis/osx..script.sh +++ b/.travis/osx..script.sh @@ -7,8 +7,11 @@ if [ $QT5 ]; then export CMAKE_PREFIX_PATH="$(brew --prefix qt5)" fi -cmake $CMAKE_FLAGS -DUSE_WERROR=OFF .. +cmake -DCMAKE_INSTALL_PREFIX=../target/ $CMAKE_FLAGS -DUSE_WERROR=OFF .. make -j4 make tests ./tests/tests + +make install +make dmg