From ba5a385d2919f5b1a1c327ec3589ab7f044d858f Mon Sep 17 00:00:00 2001
From: Tahir Akhlaq <xdemolish@hotmail.com>
Date: Fri, 11 Aug 2017 03:46:41 +0100
Subject: [PATCH] lets see if it imports this time..

---
 .travis.yml   | 24 ++++++------------------
 sql_import.sh |  3 +--
 2 files changed, 7 insertions(+), 20 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index b9d6974f..484be1ee 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,29 +6,17 @@ before_install:
   - sudo apt-get update 
   - sudo apt-get install -y software-properties-common
   - sudo apt-get update
-  - sudo apt-get install gcc-4.9 g++-4.9 gcc-4.9-multilib g++-4.9-multilib
-  - sudo apt-get install libboost-dev libboost-all-dev libmysqlclient-dev
+  - sudo apt-get install gcc-4.9 g++-4.9 gcc-4.9-multilib g++-4.9-multilib cmake3 -y
+  - sudo apt-get install libboost-dev libboost-all-dev libmysqlclient-dev -y
   
 compiler:
   - gcc
   
-install:
-  - DEPS_DIR="${TRAVIS_BUILD_DIR}/deps"
-  - mkdir ${DEPS_DIR} && cd ${DEPS_DIR}
-  
-  - |
-    if [[ "${TRAVIS_OS_NAME}" == "linux" ]]; then
-      CMAKE_URL="http://www.cmake.org/files/v3.3/cmake-3.3.2-Linux-x86_64.tar.gz"
-      mkdir cmake && travis_retry wget --no-check-certificate --quiet -O - ${CMAKE_URL} | tar --strip-components=1 -xz -C cmake
-      export PATH=${DEPS_DIR}/cmake/bin:${PATH}
-    fi
-  
-  # Go to the Root directory  
-  - cd ..
-
+ 
 # Build steps
 script:
   - mkdir build
   - cd build
-  - ${DEPS_DIR}/cmake/bin/cmake .. -DSAPPHIRE_BOOST_VER="1.54.0" -DCMAKE_CXX_COMPILER=g++-4.9 -DCMAKE_C_COMPILER=gcc-4.9 && make
-  - sh ./sql_import.sh
+  - cmake .. -DSAPPHIRE_BOOST_VER="1.54.0" -DCMAKE_CXX_COMPILER=g++-4.9 -DCMAKE_C_COMPILER=gcc-4.9 && make -j 3
+  - cd ..
+  - bash sql_import.sh
\ No newline at end of file
diff --git a/sql_import.sh b/sql_import.sh
index 59785957..a49e7f12 100644
--- a/sql_import.sh
+++ b/sql_import.sh
@@ -1,6 +1,5 @@
 #!/bin/bash
 cd sql
-mysql -u root -e 'drop database sapphire;'
 mysql -u root -e 'create database sapphire;'
 for f in *.sql
   do
@@ -10,6 +9,6 @@ for f in *.sql
     CODE=$?
     if [ $CODE -ne 0 ]; then exit $CODE; fi
 done
-mysql sapphire -u root < update.sql -f
+#mysql sapphire -u root < update.sql -f
 echo 'todo: test update sql'
 cd ..