From fcbd10e6f7ed901f70367e77ef2535ece33475c0 Mon Sep 17 00:00:00 2001
From: Jacek Sieka <jacek@status.im>
Date: Tue, 21 Aug 2018 13:13:35 -0600
Subject: [PATCH] travis: simplify script

---
 .travis.yml | 29 +++++++++++------------------
 1 file changed, 11 insertions(+), 18 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 9b8c5eb6a..bc495582f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,27 +1,30 @@
 language: c # or other C/C++ variants
 
+# https://docs.travis-ci.com/user/caching/#ccache-cache
 cache: ccache
 
+install:
+  - git clone https://github.com/status-im/nim.git
+  - cd nim
+  - sh build_all.sh
+  - cd ..
+  - export PATH=$PWD/nim/bin:$PATH
+
+script:
+  - nimble install -dy && nimble test
+
 matrix:
   # allow_failures:
   #   - os: osx
 
   include:
     - os: linux
-      cache: ccache
       sudo: required
       before_install:
         - sudo apt-get install -y libssl-dev libgflags-dev libsnappy-dev
         - git clone https://github.com/facebook/rocksdb.git
         # rocksdb not present on trusty - on a newer ubuntu you can apt-get install -y librocksdb-dev
         - cd rocksdb && git checkout v5.14.2 && make shared_lib -j$(nproc) && sudo make INSTALL_PATH=/usr install-shared && cd ..
-        - git clone https://github.com/status-im/nim.git
-        - cd nim
-        - sh build_all.sh
-        - cd ..
-        - export PATH=$PWD/nim/bin:$PATH
-      script:
-        - nimble install -dy && nimble test
 
     - os: osx
       before_install:
@@ -29,13 +32,3 @@ matrix:
         - brew install rocksdb ccache
         - export PATH="/usr/local/opt/ccache/libexec:$PATH"
         # - brew install gcc
-
-        - git clone https://github.com/status-im/nim.git
-        - cd nim
-        - sh build_all.sh
-        - cd ..
-        - export PATH=$PWD/nim/bin:$PATH
-
-
-      script:
-        - nimble install -dy && nimble test