From b2aa5e19919a8b5f892f4573ae46a0f53b39855c Mon Sep 17 00:00:00 2001
From: filux <smartadminpl@gmail.com>
Date: Sat, 21 Jan 2017 10:44:47 +0100
Subject: [PATCH] travis' configuration test 3

---
 .travis.yml                     | 7 +++++--
 mk/linux/make-binary-archive.sh | 2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index f03217f8..992a8f85 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -31,7 +31,9 @@ matrix:
       # https://github.com/Homebrew/brew/blob/master/docs/Installation.md#requirements
   fast_finish: true
   allow_failures:
-    #- os: osx
+    - os: osx
+    # it's not really acceptable to wait 40 minutes or sometimes up to even 3 hours
+    # for the result just because the queue for mac is always so long
 
 git:
   submodules: false
@@ -57,7 +59,8 @@ before_install:
 
 script:
 # ALL THE BUILD COMMANDS HERE
-  - if [ "$TRAVIS_OS_NAME" = "linux" ] && [ "$(echo "$CC" | grep 'clang')" = "" ]; then mk/linux/build-mg.sh -c 4; else mk/linux/build-mg.sh -w -c 4; fi
+  - if [ "$TRAVIS_OS_NAME" = "linux" ] && [ "$(echo "$CC" | grep 'clang')" = "" ]; then mk/linux/build-mg.sh -c 4; fi
+  - if [ "$TRAVIS_OS_NAME" = "linux" ] && [ "$(echo "$CC" | grep 'clang')" != "" ]; then mk/linux/build-mg.sh -w -c 4; fi
   # ^ -w may be removed on more modern dist: than trusty, problems related with 'new wx+clang+old gcc'
   - if [ "$TRAVIS_OS_NAME" = "osx" ]; then mk/macos/build-mg.sh -c 4; fi
 
diff --git a/mk/linux/make-binary-archive.sh b/mk/linux/make-binary-archive.sh
index 983408ad..e8724ee7 100755
--- a/mk/linux/make-binary-archive.sh
+++ b/mk/linux/make-binary-archive.sh
@@ -9,7 +9,7 @@ CURRENTDIR="$(dirname "$(readlink -f "$0")")"
 # set this to non 0 to skip building the binary
 skipbinarybuild=0
 if [ "$1" = "-CI" ] || ( [ "$1" = "--installer" ] && \
-    [ "$(find "$CURRENTDIR" -name 'megaglest' -mmin -60)" ] ); then
+    [ "$(find "$CURRENTDIR" -maxdepth 1 -name 'megaglest' -mmin -60)" ] ); then
     skipbinarybuild=1
 fi