[beast: 10/11] TRAVIS: leave package handling to Dockerfile

[Tim Janik <timj src gnome org>]

commit dbc22631db7feb2c487e6a726a3dfe80105993f3
Author: Tim Janik <timj gnu org>
Date:   Wed Oct 19 22:14:01 2016 +0200

    TRAVIS: leave package handling to Dockerfile
    
    Signed-off-by: Tim Janik <timj gnu org>

 .travis.yml |   39 +++++++++++++++------------------------
 1 files changed, 15 insertions(+), 24 deletions(-)
---
diff --git a/.travis.yml b/.travis.yml
index 4f7871a..2fab75a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -11,58 +11,49 @@ language: c
 
 env:
   global:
-    #- http_proxy="http://example.com";
-    - INTENT="package" # default intent
+    - INTENT="package,bintrayup" # default
   matrix:
     # package: build packages for distribution $DIST
     - DIST="ubuntu:wily"
     - DIST="debian:jessie"
     - DIST="debian:testing"
     - DIST="ubuntu:xenial"
+    - DIST="ubuntu:yakkety"
     # distcheck: succeed in 'make distcheck'
     - INTENT="distcheck" DIST="ubuntu:wily"
+    # clangbuild: succeed in using clang++ for builds
+    - INTENT="clangbuild" DIST="ubuntu:wily"
 matrix:
   allow_failures:
-    - env: DIST="debian:testing"
     - env: DIST="ubuntu:xenial"
+    - env: DIST="ubuntu:yakkety"
+    - env: DIST="debian:testing"
     - env: INTENT="distcheck" DIST="ubuntu:wily"
   fast_finish: true
 
 before_install:
-  # buildtool.sh requires complete history for monotonic revisioning
-  - travis_retry git fetch --unshallow
-  # Build variable setup; example: DIST=debian:jessie DISTNAME=debian DISTRELEASE=jessie BTREPO=devel
-  # Uses `buildtool.sh` to determine the version dependent bintray repository name
-  - true &&
-    export DISTNAME="${DIST%:*}" DISTRELEASE="${DIST#*:}" BTREPO="`./buildtool.sh ifdevel devel deb`" &&
-    export BEASTAPTSOURCE="deb [trusted=yes] https://dl.bintray.com/beast-team/$BTREPO $DISTRELEASE main" &&
-    echo "INTENT=$INTENT DIST=$DIST DISTNAME=$DISTNAME DISTRELEASE=$DISTRELEASE 
BEASTAPTSOURCE='$BEASTAPTSOURCE'"
-  # Sample environment
+  # Show build setup
+  - echo "INTENT=$INTENT DIST=$DIST"
   - uname -a
   - cat /etc/os-release
   - pwd
   - free -tm
+  - $CC --version
+  - $CXX --version
   - make --version
   - python --version
-  - $CC --version
 
 install:
-  # Configure Dockerfile by substituting @VAR@ with $VAR
-  - ./buildtool.sh applyenv .travis.docker > Dockerfile
-  # Build and run tests, create packages
-  - docker build -t beast .
+  # git describe requires complete history
+  - travis_retry git fetch --unshallow
 
 script:
-  # Upload packages
-  - ([ $INTENT = package ] || exit 0 && docker run -ti --rm beast /bin/bash -c \
-      "export BINTRAY_APITOKEN=$BINTRAY_APITOKEN && ls -al && beast/buildtool.sh bintrayup beast-team 
$BTREPO/beast $DISTRELEASE *.deb")
-  # Test package installation from remote location
-  - ([ $INTENT = package ] || exit 0 && sleep 60 && travis_retry docker run -ti --rm beast /bin/bash -c \
-        "set -x && retry apt-get update && retry apt-get -y install beast libbse-dev")
+  # Build inside docker container
+  - misc/dockerbuild.sh "$DIST" "$INTENT"
   - docker ps -a
 
 after_success:
-  - echo "Done, all OK!"
+  - echo "OK, all done."
 
 notifications:
   irc: