From f135c3dcb8f0b45b8de0735591111b72d737d6e8 Mon Sep 17 00:00:00 2001 From: Rasmus Thomsen Date: Sat, 4 Apr 2020 14:12:25 +0200 Subject: [PATCH 1/3] ci: install ninja via pip --- .travis.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index dbda060..deba62d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,9 +14,8 @@ d: - ldc-latest-ci before_install: - - if [ "$TRAVIS_OS_NAME" = "linux" ]; then sudo apt-get update && sudo apt-get -y install ninja-build python3-pip python3-setuptools; fi - - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update && brew install ninja; fi - - pip3 install meson + - if [ "$TRAVIS_OS_NAME" = "linux" ]; then sudo apt-get update && sudo apt-get -y install python3-pip python3-setuptools; fi + - pip3 install meson ninja matrix: include: From a6ca3158658cf31d96ea4af555ff206b362af82b Mon Sep 17 00:00:00 2001 From: Rasmus Thomsen Date: Fri, 17 Apr 2020 19:14:48 +0200 Subject: [PATCH 2/3] 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 From 9281d8216a540734ed632825993adb4274b2851f Mon Sep 17 00:00:00 2001 From: Rasmus Thomsen Date: Fri, 17 Apr 2020 19:15:08 +0200 Subject: [PATCH 3/3] build: sync meson version back up to release version --- meson.build | 2 +- travis.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/meson.build b/meson.build index 35f909e..677f166 100644 --- a/meson.build +++ b/meson.build @@ -1,6 +1,6 @@ project('taggedalgebraic', 'd', meson_version: '>=0.50', - version: '0.11.9' + version: '0.11.12' ) project_soversion = '0' diff --git a/travis.sh b/travis.sh index 5c15a3a..8fcade5 100755 --- a/travis.sh +++ b/travis.sh @@ -11,7 +11,7 @@ if [ ! -z "${COVERAGE:-}" ]; then else dub test - if [ "x$TEST_MESON" = "xtrue" ] && ! [ "x$TRAVIS_COMPILER" = "xdmd" && $(dmd --version | head -n1) = "DMD64 D Compiler v2.085.1"]; then + if [ "x$TEST_MESON" = "xtrue" ] && [ "x$(dmd --version | head -n1)" != "xDMD64 D Compiler v2.085.1" ]; then meson build && ninja -C build fi fi