From a6ca3158658cf31d96ea4af555ff206b362af82b Mon Sep 17 00:00:00 2001 From: Rasmus Thomsen Date: Fri, 17 Apr 2020 19:14:48 +0200 Subject: [PATCH] ci: enable use of meson again --- .travis.yml | 4 ++++ travis.sh | 4 +++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index deba62d..39b3bb7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,6 +13,10 @@ d: - dmd-nightly - ldc-latest-ci +env: + global: + - TEST_MESON=true + before_install: - if [ "$TRAVIS_OS_NAME" = "linux" ]; then sudo apt-get update && sudo apt-get -y install python3-pip python3-setuptools; fi - pip3 install meson ninja diff --git a/travis.sh b/travis.sh index 10f05e5..5c15a3a 100755 --- a/travis.sh +++ b/travis.sh @@ -11,5 +11,7 @@ if [ ! -z "${COVERAGE:-}" ]; then else dub test - meson build && ninja -C build || echo Warning: Meson build failed! + if [ "x$TEST_MESON" = "xtrue" ] && ! [ "x$TRAVIS_COMPILER" = "xdmd" && $(dmd --version | head -n1) = "DMD64 D Compiler v2.085.1"]; then + meson build && ninja -C build + fi fi