From 77e0bde010a83e4bb46d5a76aaa3101b86f95288 Mon Sep 17 00:00:00 2001 From: falkTX Date: Sun, 13 Jun 2021 19:29:58 +0100 Subject: [PATCH] Try enabling all CI steps Signed-off-by: falkTX --- .travis.yml | 29 ++++++++++++++++++++++++----- .travis/install.sh | 2 +- .travis/script-linux.sh | 3 +++ 3 files changed, 28 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index e315bdd4..14a688f0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,7 +4,6 @@ cache: - ${HOME}/debs jobs: - # linux native build - name: "Linux native" os: linux compiler: gcc @@ -13,13 +12,33 @@ jobs: - TARGET="linux" services: - xvfb + script: + - sh ${TRAVIS_BUILD_DIR}/.travis/script-linux.sh + + - name: "win32 cross-compilation" + os: linux + compiler: gcc + dist: bionic + env: + - TARGET="win32" + services: + - xvfb + script: + - sh ${TRAVIS_BUILD_DIR}/.travis/script-win32.sh + + - name: "win64 cross-compilation" + os: linux + compiler: gcc + dist: bionic + env: + - TARGET="win32" + services: + - xvfb + script: + - sh ${TRAVIS_BUILD_DIR}/.travis/script-win64.sh before_install: - bash ${TRAVIS_BUILD_DIR}/.travis/before_install.sh install: - bash ${TRAVIS_BUILD_DIR}/.travis/install.sh - -script: - - make - - make -C tests diff --git a/.travis/install.sh b/.travis/install.sh index b45bf775..f2ef5e43 100755 --- a/.travis/install.sh +++ b/.travis/install.sh @@ -22,7 +22,7 @@ if [ "${TARGET}" = "win32" ]; then elif [ "${TARGET}" = "win64" ]; then sudo apt-get install -y binutils-mingw-w64-x86-64 g++-mingw-w64-x86-64 mingw-w64 winehq-stable else - sudo apt-get install -y libcairo2-dev libgl1-mesa-dev libglu1-mesa-dev libjack-jackd2-dev liblo-dev libx11-dev + sudo apt-get install -y libcairo2-dev libgl1-mesa-dev libglu1-mesa-dev liblo-dev libx11-dev fi # Special handling for caching deb archives diff --git a/.travis/script-linux.sh b/.travis/script-linux.sh index 7d6a524b..c1d61b28 100755 --- a/.travis/script-linux.sh +++ b/.travis/script-linux.sh @@ -11,6 +11,9 @@ echo "==============> Normal build" make clean >/dev/null make +echo "==============> Run automated tests" +make -C tests run + echo "==============> No namespace build" make clean >/dev/null make CXXFLAGS="${_FLAGS} -DDONT_SET_USING_DISTRHO_NAMESPACE -DDONT_SET_USING_DGL_NAMESPACE"