1 files changed, 33 insertions, 40 deletions

diff --git a/.travis.yml b/.travis.yml
index 5bb5a87d..416aecc7 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -9,10 +9,10 @@ language: c
 matrix:
   include:
   - stage: "Stage 1"
-    env: JOB=toxcore ENV=linux
+    env: JOB=cmake-linux
     compiler: gcc
     addons:
-      apt: &apt-dependencies
+      apt:
         packages:
         - libconfig-dev         # For tox-bootstrapd.
         - libcv-dev             # For av_test.
@@ -23,57 +23,55 @@ matrix:
         - libgtest-dev          # For unit tests.
         - libvpx-dev            # For toxav.
         - portaudio19-dev       # For av_test.
+    install:       .travis/$JOB install
+    script:        .travis/$JOB script
+    after_script:  .travis/upload-coverage
   - stage: "Stage 1"
-    if: type IN (push, api, cron)
-    env: JOB=autotools ENV=linux
+    env: JOB=autotools-linux
     compiler: clang
     addons:
-      apt: *apt-dependencies
-  - stage: "Stage 1"
-    if: type IN (push, api, cron)
-    env: JOB=toxcore ENV=windows ARCH=i686
-    group: deprecated-2017Q4
-    services:
-    - docker
-  - stage: "Stage 1"
-    if: type IN (push, api, cron)
-    env: JOB=toxcore ENV=windows ARCH=x86_64
-    group: deprecated-2017Q4
-    services:
-    - docker
+      apt:
+        packages:
+        - libconfig-dev         # For tox-bootstrapd.
+        - libopus-dev           # For toxav.
+        - libvpx-dev            # For toxav.
+    install:       .travis/$JOB install
+    script:        .travis/$JOB script
   - stage: "Stage 1"
     if: type IN (push, api, cron)
-    env: JOB=installmd ENV=windows SUPPORT_ARCH_i686=true SUPPORT_ARCH_x86_64=false SUPPORT_TEST=true ENABLE_ARCH_i686=true ENABLE_ARCH_x86_64=false ENABLE_TEST=true ALLOW_TEST_FAILURE=true
-    services:
-    - docker
+    env: JOB=cmake-win32
+    services: [docker]
+    install:       .travis/$JOB install
+    script:        .travis/$JOB script
   - stage: "Stage 1"
     if: type IN (push, api, cron)
-    env: JOB=installmd ENV=windows SUPPORT_ARCH_i686=false SUPPORT_ARCH_x86_64=true SUPPORT_TEST=true ENABLE_ARCH_i686=false ENABLE_ARCH_x86_64=true ENABLE_TEST=true ALLOW_TEST_FAILURE=true
-    services:
-    - docker
+    env: JOB=cmake-win64
+    services: [docker]
+    install:       .travis/$JOB install
+    script:        .travis/$JOB script
   - stage: "Stage 1"
     if: type IN (push, api, cron)
-    env: JOB=toxcore ENV=freebsd
-    dist: trusty
+    env: JOB=cmake-freebsd
     sudo: required
-    install:       other/travis/phase $JOB $ENV install       stage1
-    script:        other/travis/phase $JOB $ENV script        stage1
+    install:       .travis/$JOB-stage1 install
+    script:        .travis/$JOB-stage1 script
   - stage: "Stage 1"
     if: type IN (push, api, cron)
-    env: JOB=tox-bootstrapd-docker ENV=linux
-    services:
-    - docker
-    sudo: required
+    env: JOB=tox-bootstrapd-docker
+    services: [docker]
+    script:        .travis/$JOB
   - stage: "Stage 2"
     if: type IN (push, api, cron)
-    env: JOB=toxcore ENV=freebsd
-    dist: trusty
+    env: JOB=cmake-freebsd
     sudo: required
-    install:       other/travis/phase $JOB $ENV install       stage2
+    install:       .travis/$JOB-stage2 install
+    script:        .travis/$JOB-stage2 script
   - stage: "Stage 2"
     if: type IN (push, api, cron)
-    env: JOB=toxcore ENV=osx RUN_TESTS=true
+    env: JOB=cmake-osx
     os: osx
+    install:       .travis/$JOB install
+    script:        .travis/$JOB script
   fast_finish: true
 
 cache:
@@ -81,11 +79,6 @@ cache:
   - $HOME/cache
   - /opt/freebsd/cache
 
-install:       other/travis/phase $JOB $ENV install
-script:        other/travis/phase $JOB $ENV script
-after_script:  other/travis/phase $JOB $ENV after_script
-after_failure: other/travis/phase $JOB $ENV after_failure
-
 notifications:
   irc:
     channels: