Reformat .travis.yml

diff --git a/.travis.yml b/.travis.yml
index 4b4fb85c0c7a8d481c3702c4f6fae18fc5cdb5fd..2d8674eea8be5a746b848b192a418cf24198f4c4 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,23 +1,24 @@
 language: c
 compiler:
-  - clang
-  - gcc
+- clang
+- gcc
 sudo: true
 dist: trusty
 env:
   global:
-    - PANIC_ACTION="gdb -batch -x raddb/panic.gdb %e %p 1>&0 2>&0"
-    - SQL_MYSQL_TEST_SERVER="127.0.0.1"
-    - SQL_POSTGRESQL_TEST_SERVER="127.0.0.1"
-    - LDAP_TEST_SERVER="127.0.0.1"
-    - LDAP_TEST_SERVER_PORT="3890"
-    - secure: "H+uQeyOgsIyXtIPPG2VzAG8S/8KYGHlHaWhdiNuz1LM3SMcEKoPqG6o/P+HO8HVvYnA6nelyGuEryV90UfuwGY9YC6A/pqPQvx/gXSso63Zt66XSaiZjulCSm9OV8EB3wyWF7VSQ/ZHcn+L01hIlsQXTqLprMaC33cM0FYPr9fY="
+  - PANIC_ACTION="gdb -batch -x raddb/panic.gdb %e %p 1>&0 2>&0"
+  - SQL_MYSQL_TEST_SERVER="127.0.0.1"
+  - SQL_POSTGRESQL_TEST_SERVER="127.0.0.1"
+  - LDAP_TEST_SERVER="127.0.0.1"
+  - LDAP_TEST_SERVER_PORT="3890"
+  - secure: H+uQeyOgsIyXtIPPG2VzAG8S/8KYGHlHaWhdiNuz1LM3SMcEKoPqG6o/P+HO8HVvYnA6nelyGuEryV90UfuwGY9YC6A/pqPQvx/gXSso63Zt66XSaiZjulCSm9OV8EB3wyWF7VSQ/ZHcn+L01hIlsQXTqLprMaC33cM0FYPr9fY=
   matrix:
-    - TEST_CERTS=yes DO_BUILD=yes LIBS_OPTIONAL=no LIBS_SHARED=yes BUILD_CFLAGS="-DWITH_EVAL_DEBUG"
-    - TEST_CERTS=yes DO_BUILD=yes LIBS_OPTIONAL=yes LIBS_SHARED=yes BUILD_CFLAGS="-DWITH_EVAL_DEBUG"
-    - TEST_CERTS=yes DO_BUILD=yes LIBS_OPTIONAL=yes LIBS_SHARED=yes BUILD_CFLAGS="-DWITH_EVAL_DEBUG -O2 -g3"
-    - TEST_CERTS=yes DO_BUILD=yes LIBS_OPTIONAL=yes LIBS_SHARED=yes BUILD_CFLAGS="-DNDEBUG"
-    - DO_BUILD=no
+  - TEST_CERTS=yes DO_BUILD=yes LIBS_OPTIONAL=no LIBS_SHARED=yes BUILD_CFLAGS="-DWITH_EVAL_DEBUG"
+  - TEST_CERTS=yes DO_BUILD=yes LIBS_OPTIONAL=yes LIBS_SHARED=yes BUILD_CFLAGS="-DWITH_EVAL_DEBUG"
+  - TEST_CERTS=yes DO_BUILD=yes LIBS_OPTIONAL=yes LIBS_SHARED=yes BUILD_CFLAGS="-DWITH_EVAL_DEBUG
+    -O2 -g3"
+  - TEST_CERTS=yes DO_BUILD=yes LIBS_OPTIONAL=yes LIBS_SHARED=yes BUILD_CFLAGS="-DNDEBUG"
+  - DO_BUILD=no
 addons:
   coverity_scan:
     project:
@@ -28,78 +29,76 @@ addons:
     build_command_prepend: ./configure -with-rlm-python-bin=/usr/bin/python2.7
     build_command: make
     branch_pattern: coverity_scan
-  postgresql: "9.4"
+  postgresql: '9.4'
   apt:
     sources:
-      - couchbase-precise
+    - couchbase-precise
     packages:
-      - autoconf
-      - build-essential
-      - debhelper
-      - devscripts
-      - dh-make
-      - doxygen
-      - fakeroot
-      - gcc-4.9
-      - gccgo-4.9
-      - gdb
-      - graphviz
-      - lintian
-      - mysql-server-5.6
-      - pbuilder
-      - python-dev
-      - quilt
-      - libcollectdclient-dev
-      - firebird-dev
-      - freetds-dev
-      - libcap-dev
-      - libcurl4-openssl-dev
-      - libgdbm-dev
-      - libhiredis-dev
-      - libidn11-dev
-      - libiodbc2-dev
-      - libiodbc2
-      - libjson0
-      - libjson0-dev
-      - libkrb5-dev
-      - libkqueue-dev
-      - libldap2-dev
-      - libluajit-5.1-dev
-      - libmemcached-dev
-      - libmysqlclient-dev
-      - libnl-genl-3-dev
-      - libpam0g-dev
-      - libpcap-dev
-      - libpcre3-dev
-      - libperl-dev
-      - libpq-dev
-      - libpython-all-dev
-      - libreadline-dev
-      - libsnmp-dev
-      - libssl-dev
-      - libtalloc-dev
-      - libtalloc2-dbg
-      - libunbound-dev
-      - libwbclient-dev
-      - libykclient-dev
-      - libyubikey-dev
-      - slapd
-      - ldap-utils
+    - autoconf
+    - build-essential
+    - debhelper
+    - devscripts
+    - dh-make
+    - doxygen
+    - fakeroot
+    - gcc-4.9
+    - gccgo-4.9
+    - gdb
+    - graphviz
+    - lintian
+    - mysql-server-5.6
+    - pbuilder
+    - python-dev
+    - quilt
+    - libcollectdclient-dev
+    - firebird-dev
+    - freetds-dev
+    - libcap-dev
+    - libcurl4-openssl-dev
+    - libgdbm-dev
+    - libhiredis-dev
+    - libidn11-dev
+    - libiodbc2-dev
+    - libiodbc2
+    - libjson0
+    - libjson0-dev
+    - libkrb5-dev
+    - libkqueue-dev
+    - libldap2-dev
+    - libluajit-5.1-dev
+    - libmemcached-dev
+    - libmysqlclient-dev
+    - libnl-genl-3-dev
+    - libpam0g-dev
+    - libpcap-dev
+    - libpcre3-dev
+    - libperl-dev
+    - libpq-dev
+    - libpython-all-dev
+    - libreadline-dev
+    - libsnmp-dev
+    - libssl-dev
+    - libtalloc-dev
+    - libtalloc2-dbg
+    - libunbound-dev
+    - libwbclient-dev
+    - libykclient-dev
+    - libyubikey-dev
+    - slapd
+    - ldap-utils
 services:
-  - mysql
-  - postgresql
-  - redis-server
+- mysql
+- postgresql
+- redis-server
 before_install:
-  - if [ "${CC}" == 'gcc' ]; then sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-4.9 60; fi
-  - if [ "${CC}" == 'gcc' ]; then sudo update-alternatives --config gcc; fi
-  - $CC --version
+- if [ "${CC}" == 'gcc' ]; then sudo update-alternatives --install /usr/bin/gcc gcc
+  /usr/bin/gcc-4.9 60; fi
+- if [ "${CC}" == 'gcc' ]; then sudo update-alternatives --config gcc; fi
+- $CC --version
 before_script:
-  - ./scripts/travis/build.sh
+- ./scripts/travis/build.sh
 script:
-# If this is not a coverity scan, run the tests.  This is an optimisation to make sure we don't run tests
-# on the same build product multiple times.
-  - if [ "${DO_BUILD}" = 'yes' -a "${COVERITY_SCAN_BRANCH}" != 1 ]; then make travis-test; fi
-# Build the debian packages (disabled until we get the dependencies fixed)
-#  - if [ "${DO_BUILD}" = 'no' ]; then make deb; fi
-# Build the doxygen documentation
-  - 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
+- 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