From c330db914bd29741a9e059ad1101280d07355207 Mon Sep 17 00:00:00 2001
From: R4SAS <r4sas@i2pmail.org>
Date: Fri, 17 Nov 2017 11:30:54 +0300
Subject: [PATCH] test multi os building

---
 .travis.yml       | 24 ++++++++++++------------
 Makefile.homebrew |  2 +-
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index a06611a0..7ae8b18e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,11 +3,13 @@ cache:
   apt: true
   directories:
     - $HOME/Library/Caches/Homebrew
-os:
-  # - linux
-  - osx
-sudo: required
-dist: xenial
+matrix:
+  include:
+    - os: linux
+      dist: xenial
+      sudo: required
+    - os: osx
+      osx_image: xcode7.2
 addons:
   apt:
     packages:
@@ -28,14 +30,12 @@ compiler:
   - clang++
 before_install:
   - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update ; fi
-  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install libressl miniupnpc && brew upgrade boost ; fi
+  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install libressl miniupnpc ; fi
+  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew outdated <package-name> || brew upgrade <package-name> ; fi
 env:
   matrix:
-    - BUILD_TYPE=Release UPNP=ON OSX_UPNP=yes
-    - BUILD_TYPE=Release UPNP=OFF OSX_UPNP=no
-  exclude:
-    - os: osx
-      compiler: g++
+    - BUILD_TYPE=Release UPNP=ON MAKE_UPNP=yes
+    - BUILD_TYPE=Release UPNP=OFF MAKE_UPNP=no
 script:
   - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then cd build && cmake -DCMAKE_BUILD_TYPE=${BUILD_TYPE} -DWITH_UPNP=${UPNP} && make ; fi
-  - if [[ "$TRAVIS_OS_NAME" == "osx" ]];   then make HOMEBREW=1 USE_UPNP=${OSX_UPNP} ; fi
+  - if [[ "$TRAVIS_OS_NAME" == "osx" ]];   then make HOMEBREW=1 USE_UPNP=${MAKE_UPNP} ; fi
diff --git a/Makefile.homebrew b/Makefile.homebrew
index e6acc51d..09838ac2 100644
--- a/Makefile.homebrew
+++ b/Makefile.homebrew
@@ -6,7 +6,7 @@ UPNPROOT = ${BREWROOT}/opt/miniupnpc
 CXXFLAGS = -g -Wall -std=c++11 -DMAC_OSX -Wno-overloaded-virtual
 INCFLAGS = -I${SSLROOT}/include -I${BOOSTROOT}/include 
 
-ifndef TRAVIS_OS_NAME
+ifndef TRAVIS
   CXX = clang++
 endif