travis: Use Trusty beta image
authorTobias Brunner <tobias@strongswan.org>
Thu, 25 Aug 2016 12:04:22 +0000 (14:04 +0200)
committerTobias Brunner <tobias@strongswan.org>
Mon, 5 Sep 2016 14:58:29 +0000 (16:58 +0200)
.travis.yml
scripts/test.sh

index 04838e8..99176ba 100644 (file)
@@ -1,5 +1,8 @@
 language: c
 
 language: c
 
+sudo: required
+dist: trusty
+
 compiler:
   - gcc
   - clang
 compiler:
   - gcc
   - clang
index 1d94b9b..9365492 100755 (executable)
@@ -50,7 +50,7 @@ all)
        DEPS="$DEPS libcurl4-gnutls-dev libsoup2.4-dev libunbound-dev libldns-dev
                  libmysqlclient-dev libsqlite3-dev clearsilver-dev libfcgi-dev
                  libnm-glib-dev libnm-glib-vpn-dev libpcsclite-dev libpam0g-dev
        DEPS="$DEPS libcurl4-gnutls-dev libsoup2.4-dev libunbound-dev libldns-dev
                  libmysqlclient-dev libsqlite3-dev clearsilver-dev libfcgi-dev
                  libnm-glib-dev libnm-glib-vpn-dev libpcsclite-dev libpam0g-dev
-                 binutils-dev libunwind7-dev libjson0-dev iptables-dev python-pip
+                 binutils-dev libunwind8-dev libjson0-dev iptables-dev python-pip
                  libtspi-dev"
        PYDEPS="pytest"
        ;;
                  libtspi-dev"
        PYDEPS="pytest"
        ;;
@@ -67,16 +67,16 @@ win*)
        # no make check for Windows binaries
        TARGET=
        CFLAGS="$CFLAGS -mno-ms-bitfields"
        # no make check for Windows binaries
        TARGET=
        CFLAGS="$CFLAGS -mno-ms-bitfields"
-       DEPS="gcc-mingw-w64-base mingw-w64-dev"
+       DEPS="gcc-mingw-w64-base"
        case "$TEST" in
        win64)
                CONFIG="--host=x86_64-w64-mingw32 $CONFIG"
        case "$TEST" in
        win64)
                CONFIG="--host=x86_64-w64-mingw32 $CONFIG"
-               DEPS="gcc-mingw-w64-x86-64 binutils-mingw-w64-x86-64 $DEPS"
+               DEPS="gcc-mingw-w64-x86-64 binutils-mingw-w64-x86-64 mingw-w64-x86-64-dev $DEPS"
                CC="x86_64-w64-mingw32-gcc"
                ;;
        win32)
                CONFIG="--host=i686-w64-mingw32 $CONFIG"
                CC="x86_64-w64-mingw32-gcc"
                ;;
        win32)
                CONFIG="--host=i686-w64-mingw32 $CONFIG"
-               DEPS="gcc-mingw-w64-i686 binutils-mingw-w64-i686 $DEPS"
+               DEPS="gcc-mingw-w64-i686 binutils-mingw-w64-i686 mingw-w64-i686-dev $DEPS"
                CC="i686-w64-mingw32-gcc"
                ;;
        esac
                CC="i686-w64-mingw32-gcc"
                ;;
        esac