From: Arran Cudbard-Bell <a.cudbardb@freeradius.org>
Date: Wed, 13 Sep 2017 18:32:20 +0000 (+0700)
Subject: No...
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=af66cfbb6fea87432969c11ee06a1f995f112a07;p=thirdparty%2Ffreeradius-server.git

No...

This reverts commit 740bf8e68d8508f8ec32096e15918212934b3508.
---

diff --git a/.travis.yml b/.travis.yml
index f14373d558e..c87ff1d8640 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -99,23 +99,19 @@ addons:
     - slapd
     - ldap-utils
 services:
-  - mysql
-  - postgresql
-  - redis-server
-stages:
-  - compile
-  - test
+- mysql
+- postgresql
+- redis-server
 before_install:
-  - rvm --install --default --binary use 2.4
-  - if [ "${CC}" == 'gcc' ]; then sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-4.9 60 && sudo update-alternatives --config gcc; fi
-  - if [ "${CC}" == 'clang' ]; then sudo update-alternatives --install /usr/bin/clang clang /usr/bin/clang-3.9 60 && sudo update-alternatives --config clang; fi
-  - if [ "${CC}" == 'clang' ]; then sudo update-alternatives --install /usr/bin/llvm-symbolizer llvm-symbolizer /usr/bin/llvm-symbolizer-3.9 60 && sudo update-alternatives --config llvm-symbolizer; fi
-  - $CC --version
-jobs:
-  include:
-    - stage: compile
-      script: ./scripts/travis/build.sh
-    - stage: test
-      script:
-        - if [ "${DO_BUILD}" = 'yes' -a "${COVERITY_SCAN_BRANCH}" != 1 ]; then make travis-test; fi
-        - if [ "${DO_BUILD}" = 'no' ]; then cd doc/source; doxygen 3>&1 1>&2 2>&3 | grep -iv '^warning:' | tee doxygen_stderr.log && [ ! -n "$(cat doxygen_stderr.log)" ]; fi
+- rvm --install --default --binary use 2.4
+- if [ "${CC}" == 'gcc' ]; then sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-4.9 60 && sudo update-alternatives --config gcc; fi
+- if [ "${CC}" == 'clang' ]; then sudo update-alternatives --install /usr/bin/clang clang /usr/bin/clang-3.9 60 && sudo update-alternatives --config clang; fi
+- if [ "${CC}" == 'clang' ]; then sudo update-alternatives --install /usr/bin/llvm-symbolizer llvm-symbolizer /usr/bin/llvm-symbolizer-3.9 60 && sudo update-alternatives --config llvm-symbolizer; fi
+- $CC --version
+before_script:
+- ./scripts/travis/build.sh
+script:
+- if [ "${DO_BUILD}" = 'yes' -a "${COVERITY_SCAN_BRANCH}" != 1 ]; then make travis-test;
+  fi
+- if [ "${DO_BUILD}" = 'no' ]; then cd doc/source; doxygen 3>&1 1>&2 2>&3 | grep -iv
+  '^warning:' | tee doxygen_stderr.log && [ ! -n "$(cat doxygen_stderr.log)" ]; fi