Subject: [PATCH] Fix the travis.yml to build everything

When fixing the indentation for the coverity chagnes in 924bcfbc995e5c862216f6ad47a734a2c8f14370
the build matrix got turned off. This re-enables this.

Also change from using gcc/clang. What we want is to build on both Linux
and OSX. Not just run Linux with gcc+clang.

However to enable multi-os support one has to mail the travis support:
http://docs.travis-ci.com/user/multi-os/

"This feature needs to be enabled manually. If you wish to take advantage
of this feature, please send email to support@travis-ci.com, indicating
which repository you would like to have it enabled."

diff --git a/.travis.yml b/.travis.yml
index 209a84e..88d5901 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,19 +2,20 @@ env:
   # The next declaration is the encrypted COVERITY_SCAN_TOKEN, created
   #   via the "travis encrypt" command using the project repo's public key
   global:
-   - secure: "amfzN1OzBBZYPJVx8TCYsV1nQ5SPm7QswgGpuHcNKaMAixn1s4tKliR0wyVs1aiMqKco1zrJ3vXll+D5gknKr5obWOeZ61T3PYyZmhjB0n/D+7Y41EikNa1Hn1pP6etcHh3ciJ0qe8FC+9YB5yEII3G/jHsltge8Nu+5o2YCSCw="
-   - LWS_METHOD=default
-   - LWS_METHOD=noserver CMAKE_ARGS="-DLWS_WITHOUT_SERVER=ON"
-   - LWS_METHOD=noclient CMAKE_ARGS="-DLWS_WITHOUT_CLIENT=ON"
-   - LWS_METHOD=noext CMAKE_ARGS="-DLWS_WITHOUT_EXTENSIONS=ON"
-   - LWS_METHOD=libev CMAKE_ARGS="-DLWS_WITH_LIBEV=ON"
-   - LWS_METHOD=noipv6 CMAKE_ARGS="-DLWS_IPV6=OFF"
-   - LWS_METHOD=http2 CMAKE_ARGS="-DLWS_WITH_HTTP2=ON"
-   - LWS_METHOD=nossl CMAKE_ARGS="-DLWS_WITH_SSL=OFF"
-   - LWS_METHOD=nodaemon CMAKE_ARGS="-DLWS_WITHOUT_DAEMONIZE=ON"
-compiler:
-  - gcc
-  - clang
+    - secure: "amfzN1OzBBZYPJVx8TCYsV1nQ5SPm7QswgGpuHcNKaMAixn1s4tKliR0wyVs1aiMqKco1zrJ3vXll+D5gknKr5obWOeZ61T3PYyZmhjB0n/D+7Y41EikNa1Hn1pP6etcHh3ciJ0qe8FC+9YB5yEII3G/jHsltge8Nu+5o2YCSCw="
+  matrix:
+    - LWS_METHOD=default
+    - LWS_METHOD=noserver CMAKE_ARGS="-DLWS_WITHOUT_SERVER=ON"
+    - LWS_METHOD=noclient CMAKE_ARGS="-DLWS_WITHOUT_CLIENT=ON"
+    - LWS_METHOD=noext CMAKE_ARGS="-DLWS_WITHOUT_EXTENSIONS=ON"
+    - LWS_METHOD=libev CMAKE_ARGS="-DLWS_WITH_LIBEV=ON"
+    - LWS_METHOD=noipv6 CMAKE_ARGS="-DLWS_IPV6=OFF"
+    - LWS_METHOD=http2 CMAKE_ARGS="-DLWS_WITH_HTTP2=ON"
+    - LWS_METHOD=nossl CMAKE_ARGS="-DLWS_WITH_SSL=OFF"
+    - LWS_METHOD=nodaemon CMAKE_ARGS="-DLWS_WITHOUT_DAEMONIZE=ON"
+os:
+  - linux
+  - osx
 language: c
 install:
   - sudo apt-get update -qq && sudo apt-get install -y -qq valgrind
@@ -25,7 +26,6 @@ addons:
   coverity_scan:
     project:
       name: "warmcat/libwebsockets"
-      description: "This is the libwebsockets C library for lightweight websocket clients and servers."
     notification_email: andy.green@linaro.org
     build_command_prepend: "mkdir build && cd build && cmake .."
     build_command:   "cmake --build ."