From b7c658e8f8e3f4544c559665f5447d2cee195334 Mon Sep 17 00:00:00 2001
From: Jonathan White <support@dmapps.us>
Date: Sat, 14 Jan 2017 22:33:16 -0500
Subject: [PATCH 1/2] Travis now performs Debug and Release builds

---
 .travis.yml | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index a7807b612..929108211 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -11,6 +11,10 @@ os:
 compiler:
   - clang
 
+env:
+  - CONFIG=Release
+  - CONFIG=Debug
+
 # Define gcc compile with deploy option (only for master/develop merges)
 matrix:
   include:
@@ -33,7 +37,7 @@ before_script:
   - mkdir build && pushd build
 
 script:
-  - cmake -DCMAKE_BUILD_TYPE=Release -DWITH_GUI_TESTS=ON -DWITH_XC_HTTP=ON -DWITH_XC_AUTOTYPE=ON -DWITH_XC_YUBIKEY=ON $CMAKE_ARGS ..
+  - cmake -DCMAKE_BUILD_TYPE=${CONFIG} -DWITH_GUI_TESTS=ON -DWITH_XC_HTTP=ON -DWITH_XC_AUTOTYPE=ON -DWITH_XC_YUBIKEY=ON $CMAKE_ARGS ..
   - make -j2
   - if [ "$TRAVIS_OS_NAME" = "linux" ]; then make test ARGS+="-E testgui --output-on-failure"; fi
   - if [ "$TRAVIS_OS_NAME" = "linux" ]; then xvfb-run -a --server-args="-screen 0 800x600x24" make test ARGS+="-R testgui --output-on-failure"; fi
@@ -42,5 +46,5 @@ script:
 # Generate snapcraft build when merging into master/develop branches
 after_success:
   - popd
-  - "[[ $DEPLOY = 1 ]] && [[ $TRAVIS_BRANCH =~ (master|develop) ]] && [[ $TRAVIS_PULL_REQUEST = false ]] \
+  - "[[ $DEPLOY = 1 ]] && [[ $CONFIG = Release ]] && [[ $TRAVIS_BRANCH =~ (master|develop) ]] && [[ $TRAVIS_PULL_REQUEST = false ]] \
     && docker run -v $(pwd):/cwd snapcore/snapcraft sh -c 'cd /cwd && apt update && snapcraft'"

From a545dc9264138b56db9fba82dde4e97d2686062b Mon Sep 17 00:00:00 2001
From: Jonathan White <support@dmapps.us>
Date: Sat, 14 Jan 2017 22:41:22 -0500
Subject: [PATCH 2/2] Removed snapcraft and unspecified unique gcc build

---
 .travis.yml | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 929108211..34bc0add5 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -10,17 +10,12 @@ os:
 # Define clang compiler without any frills
 compiler:
   - clang
+  - gcc
 
 env:
   - CONFIG=Release
   - CONFIG=Debug
 
-# Define gcc compile with deploy option (only for master/develop merges)
-matrix:
-  include:
-    - compiler: gcc
-      env: DEPLOY=1
-
 git:
   depth: 3
 
@@ -44,7 +39,7 @@ script:
   - if [ "$TRAVIS_OS_NAME" = "osx" ]; then make test ARGS+="--output-on-failure"; fi
 
 # Generate snapcraft build when merging into master/develop branches
-after_success:
-  - popd
-  - "[[ $DEPLOY = 1 ]] && [[ $CONFIG = Release ]] && [[ $TRAVIS_BRANCH =~ (master|develop) ]] && [[ $TRAVIS_PULL_REQUEST = false ]] \
-    && docker run -v $(pwd):/cwd snapcore/snapcraft sh -c 'cd /cwd && apt update && snapcraft'"
+#after_success:
+#  - popd
+#  - "[[ $DEPLOY = 1 ]] && [[ $CONFIG = Release ]] && [[ $TRAVIS_BRANCH =~ (master|develop) ]] && [[ $TRAVIS_PULL_REQUEST = false ]] \
+#    && docker run -v $(pwd):/cwd snapcore/snapcraft sh -c 'cd /cwd && apt update && snapcraft'"