From 2e2870b06c6967280b9e43a0af22bc6511a325c7 Mon Sep 17 00:00:00 2001
From: debris <marek.kotewicz@gmail.com>
Date: Sun, 29 Nov 2015 00:04:57 +0100
Subject: [PATCH 1/3] attempt to run osx on travis

---
 .travis.yml | 35 +++++++++++++++++++++--------------
 1 file changed, 21 insertions(+), 14 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 03320f067..5fcde4391 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,23 +4,30 @@ rust:
     - 1.4.0
 
 os:
-    - linux
-    #- osx
+    #- linux
+    - osx
 
 before_script:
     # g++4.8 for C++11 which is required by rocksdb
-    - sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test
-    - sudo apt-get update -y -qq
-    - sudo apt-get install -qq --yes --force-yes g++-4.8
-    - sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-4.8 50
+    - if [ $TRAVIS_OS_NAME == "linux" ]; then 
+        sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test
+        sudo apt-get update -y -qq
+        sudo apt-get install -qq --yes --force-yes g++-4.8
+        sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-4.8 50
 
-    - wget https://github.com/facebook/rocksdb/archive/rocksdb-3.13.tar.gz
-    - tar xvf rocksdb-3.13.tar.gz && cd rocksdb-rocksdb-3.13 && make shared_lib
-    - sudo make install
-    - cd ..
+        wget https://github.com/facebook/rocksdb/archive/rocksdb-3.13.tar.gz
+        tar xvf rocksdb-3.13.tar.gz && cd rocksdb-rocksdb-3.13 && make shared_lib
+        sudo make install
+        cd ..
+      else
+        brew update
+        brew install rocksdb
+      fi
 
 after_success:
-    - sudo apt-get install libcurl4-openssl-dev libelf-dev libdw-dev
-    - wget https://github.com/SimonKagstrom/kcov/archive/master.tar.gz
-    - tar xzf master.tar.gz && mkdir kcov-master/build && cd kcov-master/build && cmake .. && make && sudo make install && cd ../.. &&
-    - kcov --coveralls-id=$TRAVIS_JOB_ID --exclude-pattern=/.cargo target/kcov target/debug/ethcore_util-*
+    - if [ $TRAVIS_OS_NAME == "linux" ]; then 
+        sudo apt-get install libcurl4-openssl-dev libelf-dev libdw-dev
+        wget https://github.com/SimonKagstrom/kcov/archive/master.tar.gz
+        tar xzf master.tar.gz && mkdir kcov-master/build && cd kcov-master/build && cmake .. && make && sudo make install && cd ../.. &&
+        kcov --coveralls-id=$TRAVIS_JOB_ID --exclude-pattern=/.cargo target/kcov target/debug/ethcore_util-*
+      fi

From 1171a32ceca4cae1064df188841a2ee5b67af365 Mon Sep 17 00:00:00 2001
From: debris <marek.kotewicz@gmail.com>
Date: Sun, 29 Nov 2015 00:11:16 +0100
Subject: [PATCH 2/3] just osx on travis

---
 .travis.yml | 34 +++++++++++++++++-----------------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 5fcde4391..5e6744653 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -9,25 +9,25 @@ os:
 
 before_script:
     # g++4.8 for C++11 which is required by rocksdb
-    - if [ $TRAVIS_OS_NAME == "linux" ]; then 
-        sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test
-        sudo apt-get update -y -qq
-        sudo apt-get install -qq --yes --force-yes g++-4.8
-        sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-4.8 50
+    #- if [ $TRAVIS_OS_NAME == "linux" ]; then 
+        #sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test
+        #sudo apt-get update -y -qq
+        #sudo apt-get install -qq --yes --force-yes g++-4.8
+        #sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-4.8 50
 
-        wget https://github.com/facebook/rocksdb/archive/rocksdb-3.13.tar.gz
-        tar xvf rocksdb-3.13.tar.gz && cd rocksdb-rocksdb-3.13 && make shared_lib
-        sudo make install
-        cd ..
-      else
+        #wget https://github.com/facebook/rocksdb/archive/rocksdb-3.13.tar.gz
+        #tar xvf rocksdb-3.13.tar.gz && cd rocksdb-rocksdb-3.13 && make shared_lib
+        #sudo make install
+        #cd ..
+      #else
         brew update
         brew install rocksdb
-      fi
+      #fi
 
 after_success:
-    - if [ $TRAVIS_OS_NAME == "linux" ]; then 
-        sudo apt-get install libcurl4-openssl-dev libelf-dev libdw-dev
-        wget https://github.com/SimonKagstrom/kcov/archive/master.tar.gz
-        tar xzf master.tar.gz && mkdir kcov-master/build && cd kcov-master/build && cmake .. && make && sudo make install && cd ../.. &&
-        kcov --coveralls-id=$TRAVIS_JOB_ID --exclude-pattern=/.cargo target/kcov target/debug/ethcore_util-*
-      fi
+    #- if [ $TRAVIS_OS_NAME == "linux" ]; then 
+        #sudo apt-get install libcurl4-openssl-dev libelf-dev libdw-dev
+        #wget https://github.com/SimonKagstrom/kcov/archive/master.tar.gz
+        #tar xzf master.tar.gz && mkdir kcov-master/build && cd kcov-master/build && cmake .. && make && sudo make install && cd ../.. &&
+        #kcov --coveralls-id=$TRAVIS_JOB_ID --exclude-pattern=/.cargo target/kcov target/debug/ethcore_util-*
+      #fi

From 9dc6fa98deff6a679c488c021c2b5bc22c92aedd Mon Sep 17 00:00:00 2001
From: debris <marek.kotewicz@gmail.com>
Date: Sun, 29 Nov 2015 00:13:32 +0100
Subject: [PATCH 3/3] travis..

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

diff --git a/.travis.yml b/.travis.yml
index 5e6744653..81a39492f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -20,8 +20,8 @@ before_script:
         #sudo make install
         #cd ..
       #else
-        brew update
-        brew install rocksdb
+    - brew update
+    - brew install rocksdb
       #fi
 
 after_success: