From 761dea8591eea1a967c1af07e829139b610d860a Mon Sep 17 00:00:00 2001
From: Robert Osfield <robert@openscenegraph.com>
Date: Tue, 14 Jun 2016 17:13:39 +0100
Subject: [PATCH] Another rev of .travis.yml to try and get things working

---
 .travis.yml | 57 +++++++++++++++++++++++++++--------------------------
 1 file changed, 29 insertions(+), 28 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 5030c656c..14de75e11 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -30,37 +30,38 @@ matrix:
             #- clang-3.8
             - g++
             - cmake
-        coverity_scan:
-
-            # GitHub project metadata
-            # ** specific to your project **
-            project:
-            name: "openscenegraph/osg"
-            description: "OpenSceneGraph"
-            version: 3.5.x
-
-            # Where email notification of build analysis results will be sent
-            notification_email: robert@openscenegraph.com
-
-            # Commands to prepare for build_command
-            # ** likely specific to your build **
-            build_command_prepend: cmake -DOSG_USE_AGGRESSIVE_WARNINGS=0 .
-
-            # The command that will be added as an argument to "cov-build" to compile your project for analysis,
-            # ** likely specific to your build **
-            build_command: make -j 3
-
-            # Pattern to match selecting branches that will run analysis. We recommend leaving this set to 'coverity_scan'.
-            # Take care in resource usage, and consider the build frequency allowances per
-            #   https://scan.coverity.com/faq#frequency
-            branch_pattern: coverity_scan
 
     # OSX build
     - os: osx
       language: cpp
 
 script:
-   - mkdir build
-   - cd build
-   - travis_wait 60 cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=../product -DBUILD_OSG_EXAMPLES=ON ..
-   - make install -j 3
+   - if [ ${COVERITY_SCAN_BRANCH} != 1 ]; then  mkdir build; cd build; travis_wait 60 cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=../product -DBUILD_OSG_EXAMPLES=ON .. ; make install -j 3; fi
+
+
+addons:
+
+    coverity_scan:
+
+        # GitHub project metadata
+        # ** specific to your project **
+        project:
+        name: openscenegraph/osg
+        description: OpenSceneGraph
+        version: 3.5.x
+
+        # Where email notification of build analysis results will be sent
+        notification_email: robert@openscenegraph.com
+
+        # Commands to prepare for build_command
+        # ** likely specific to your build **
+        build_command_prepend: cmake -DOSG_USE_AGGRESSIVE_WARNINGS=0 .
+
+        # The command that will be added as an argument to "cov-build" to compile your project for analysis,
+        # ** likely specific to your build **
+        build_command: make -j 3
+
+        # Pattern to match selecting branches that will run analysis. We recommend leaving this set to 'coverity_scan'.
+        # Take care in resource usage, and consider the build frequency allowances per
+        #   https://scan.coverity.com/faq#frequency
+        branch_pattern: coverity_scan