From 54cb4d6526b2b8509603217a714265657234375a Mon Sep 17 00:00:00 2001
From: Colden Cullen <colden@coldencullen.com>
Date: Sun, 1 Nov 2020 17:30:32 -0800
Subject: [PATCH] Modernize the travis build

---
 .travis.yml            | 24 ++++++++++++------------
 .travis/setup_linux.sh |  9 ---------
 .travis/setup_osx.sh   |  7 -------
 3 files changed, 12 insertions(+), 28 deletions(-)
 delete mode 100644 .travis/setup_linux.sh
 delete mode 100644 .travis/setup_osx.sh

diff --git a/.travis.yml b/.travis.yml
index 4b643a9..3f232d0 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,19 +1,19 @@
+sudo: false
 language: d
+d:
+  - dmd
+  - ldc
 os:
   - linux
   - osx
-install:
-  - echo $TRAVIS_OS_NAME $TRAVIS_JOB_ID
-  - bash .travis/setup_linux.sh
-  - bash .travis/setup_osx.sh
-  - sudo dub fetch tested
-  - sudo dub fetch doveralls
-  # Install new dub
-  - git clone https://github.com/D-Programming-Language/dub
-  - cd dub && dub build
-  - cd ..
-script: sudo ./dub/bin/dub test -q --coverage
-after_success: sudo dub run doveralls -- -p `pwd` -j $TRAVIS_JOB_ID
+
+script: 
+  - dub test --compiler=${DC} --coverage
+
+after_success:
+  - dub fetch doveralls
+  - dub run doveralls -- -p `pwd` -j $TRAVIS_JOB_ID
+
 notifications:
   webhooks:
     urls:
diff --git a/.travis/setup_linux.sh b/.travis/setup_linux.sh
deleted file mode 100644
index 54c1773..0000000
--- a/.travis/setup_linux.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-# Only run on Linux
-#if [[ $TRAVIS_OS_NAME == "linux" ]]; then
-    sudo wget http://netcologne.dl.sourceforge.net/project/d-apt/files/d-apt.list\
-        -O/etc/apt/sources.list.d/d-apt.list;
-    sudo apt-get update;
-    sudo apt-get -y --allow-unauthenticated install --reinstall d-apt-keyring;
-    sudo apt-get update;
-    sudo apt-get install dmd-bin dub libfreeimage-dev libjpeg62-dev
-#fi
diff --git a/.travis/setup_osx.sh b/.travis/setup_osx.sh
deleted file mode 100644
index 7954632..0000000
--- a/.travis/setup_osx.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-# Only run on OSX
-if [[ $TRAVIS_OS_NAME == "osx" ]]; then
-    brew update;
-    brew install dmd;
-    brew install dub;
-    brew install freeimage
-fi