From 50f89ad07fdf40d1414c7ef171731ac520ee7141 Mon Sep 17 00:00:00 2001
From: Anton Fediushin <fediushin.anton@yandex.ru>
Date: Wed, 30 Aug 2017 21:23:49 +0300
Subject: [PATCH] Optimise TravisCI builds

---
 .travis.sh  | 15 ---------------
 .travis.yml | 11 +++++++++--
 2 files changed, 9 insertions(+), 17 deletions(-)
 delete mode 100644 .travis.sh

diff --git a/.travis.sh b/.travis.sh
deleted file mode 100644
index 8418f8a..0000000
--- a/.travis.sh
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/bash
-
-set -e
-
-if [ "$DC" != gdc ]; then
-	dub test --compiler=$DC
-fi
-
-if [ "$DC" == ldc2 ]; then
-	echo "Building $(git tag -l --points-at HEAD) for $TRAVIS_OS_NAME x86_64 using $DC"
-	dub build -b release --compiler=$DC
-	tar -zcf "covered-$(git tag -l --points-at HEAD)-$TRAVIS_OS_NAME-$DC-x86_64.tar.gz" covered
-else
-	dub build -b debug --compiler=$DC
-fi
diff --git a/.travis.yml b/.travis.yml
index 41db099..567d077 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -9,15 +9,22 @@ os:
   - linux
   - osx
 
+env:
+  - ARCH=x86_64
+
 matrix:
   exclude:
     - d: gdc
       os: osx
 
-script: bash ./.travis.sh
+script:
+  - if [ "$DC" != gdc ]; then dub test --compiler=$DC --arch=$ARCH; fi
+  - dub build -b debug --compiler=$DC --arch=$ARCH
 
 before_deploy:
-  - export FILE_TO_UPLOAD=$(ls *.tar.gz)
+  - dub build -b release --compiler=$DC --arch=$ARCH
+  - tar -zcf "covered-$TRAVIS_TAG-$TRAVIS_OS_NAME-$DC-x86_64.tar.gz" covered
+  - export FILE_TO_UPLOAD=$(ls covered-*.tar.gz)
 
 deploy:
   skip_cleanup: true