From 3d7ee66680400a30a71d058134e51c7d30a2b657 Mon Sep 17 00:00:00 2001 From: Sebastian Wilzbach Date: Wed, 24 Jan 2018 12:23:45 +0100 Subject: [PATCH] remove digger setup - test dmd-nightly instead --- .travis.yml | 10 ++++++---- travis.sh | 33 ++------------------------------- 2 files changed, 8 insertions(+), 35 deletions(-) diff --git a/.travis.yml b/.travis.yml index 2cabdacf7b..a35a3b3295 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,12 +1,14 @@ language: d -d: - - dmd sudo: false matrix: include: - - env: MODEL=64 - - env: MODEL=32 + - d: dmd + env: MODEL=64 + - d: dmd-nightly + env: MODEL=64 + - d: dmd + env: MODEL=32 addons: apt: packages: diff --git a/travis.sh b/travis.sh index e4f1cd38b5..21690b7629 100755 --- a/travis.sh +++ b/travis.sh @@ -2,34 +2,5 @@ set -uexo pipefail -DIGGER_DIR="../digger" -DIGGER="../digger/digger" - -# set to 64-bit by default -if [ -z ${MODEL:-} ] ; then - MODEL=64 -fi - -build_digger() { - git clone --recursive https://github.com/CyberShadow/Digger "$DIGGER_DIR" - git -C "$DIGGER_DIR" checkout v3.0.0-alpha-5 - (cd "$DIGGER_DIR" && rdmd --build-only -debug digger) -} - -install_digger() { - $DIGGER build --model=$MODEL "master" - export PATH=$PWD/work/result/bin:$PATH -} - -if ! [ -d "$DIGGER_DIR" ] ; then - build_digger -fi - -install_digger - -dmd --version -rdmd --help | head -n 1 -dub --version - -make -f posix.mak all DMD=$(which dmd) -make -f posix.mak test DMD=$(which dmd) +make -f posix.mak all DMD="$(which $DMD)" +make -f posix.mak test DMD="$(which $DMD)"