Fix order of dependencies in circle.yml. GTEST_DIR needs to be available when building AllJoyn.

eb6d00a7 · Brendan Long · 7308a895 · eb6d00a7
Commit eb6d00a7 authored Jan 05, 2016 by Brendan Long
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 7 deletions

circle.yml circle.yml +7 -7

No files found.
--- a/circle.yml
+++ b/circle.yml
@@ -7,13 +7,6 @@ dependencies:
  pre:
    - sudo apt-get update
    - sudo apt-get install libcap-dev scons libgtest-dev
-    - if [[ ! -e ~/alljoyn-15.09.00a-src ]] ; then
-        cd ~ ;
-        wget --no-check-certificate https://allseenalliance.org/releases/alljoyn/15.09/alljoyn-15.09.00a-src.tar.gz ;
-        tar -xf alljoyn-15.09.00a-src.tar.gz ;
-        cd alljoyn-15.09.00a-src ;
-        scons BINDINGS=cpp OS=linux CPU=x86_64 VARIANT=release BUILD_SERVICE_SAMPLES=off WS=off BT=off ICE=off -j4 ;
-      fi
    - if [[ ! -e ~/gtest ]] ; then
        cd ~ ;
        cp -r /usr/src/gtest . ;
@@ -21,6 +14,13 @@ dependencies:
        cmake -DCMAKE_BUILD_TYPE=RELEASE . ;
        make ;
      fi
+    - if [[ ! -e ~/alljoyn-15.09.00a-src ]] ; then
+        cd ~ ;
+        wget --no-check-certificate https://allseenalliance.org/releases/alljoyn/15.09/alljoyn-15.09.00a-src.tar.gz ;
+        tar -xf alljoyn-15.09.00a-src.tar.gz ;
+        cd alljoyn-15.09.00a-src ;
+        scons BINDINGS=cpp OS=linux CPU=x86_64 VARIANT=release BUILD_SERVICE_SAMPLES=off WS=off BT=off ICE=off -j4 ;
+      fi

  post:
    - make -j4