From a50f1f2687c3db98b54a6dc5d83576d6f0d8b943 Mon Sep 17 00:00:00 2001
From: Victor Häggqvist <victor@snilius.com>
Date: Wed, 2 Jul 2014 15:10:49 +0200
Subject: travis update

---
 .travis.yml | 47 +++++++++++++++--------------------------------
 1 file changed, 15 insertions(+), 32 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 9a92162..d96d7aa 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,37 +1,20 @@
-language: c
-before_install:
-  - PROJECT_PATH=$(pwd)
-  - PEBBLE_SDK=PebbleSDK-2.2
-  - echo 'Installing Pebble SDK Dependencies...'
-  - echo 'SDK ${PEBBLE_SDK}'
-  - cd ~ 
-
-# Get the Pebble SDK and toolchain
-  - wget http://dump.victorhaggqvist.com/${PEBBLE_SDK}.tar.gz -O PebbleSDK.tar.gz #cuz need to login to download from pebble..
-  - wget http://assets.getpebble.com.s3-website-us-east-1.amazonaws.com/sdk/arm-cs-tools-ubuntu-universal.tar.gz
+# Test
+language: python
 
-# Build the Pebble directory
-  - mkdir ~/pebble-dev
-  - cd ~/pebble-dev
-  
-# Extract the SDK
-  - tar -zxf ~/PebbleSDK.tar.gz
-  - cd ~/pebble-dev/${PEBBLE_SDK}
+script:
+- pebble-dev/${PEBBLE_SDK}/bin/pebble build
 
-# Extract the toolchain
-  - tar -zxf ~/arm-cs-tools-ubuntu-universal.tar.gz
-  - export PATH=~/pebble-dev/${PEBBLE_SDK}/bin:$PATH
+before_install:
+- wget http://assets.getpebble.com.s3-website-us-east-1.amazonaws.com/sdk2/${PEBBLE_SDK}.tar.gz -O PebbleSDK.tar.gz
+- wget http://assets.getpebble.com.s3-website-us-east-1.amazonaws.com/sdk/arm-cs-tools-ubuntu-universal.tar.gz
+- mkdir pebble-dev
+- tar -zxf PebbleSDK.tar.gz -C pebble-dev
+- tar -zxf arm-cs-tools-ubuntu-universal.tar.gz -C pebble-dev/${PEBBLE_SDK}
 
-# python stuff
-  - sudo apt-get install python-pip python2.7-dev
-  - sudo pip install virtualenv
-  - virtualenv --no-site-packages .env
-  - source .env/bin/activate
-  - pip install -r ~/pebble-dev/PebbleSDK-2.2/requirements.txt
-  - deactivate
+install:
+- "pip install -r pebble-dev/${PEBBLE_SDK}/requirements.txt"
 
-script:
-  - echo "Building Pebble project..."
-  - cd ${PROJECT_PATH}
-  - pebble build
+env:
+  global:
+  - PEBBLE_SDK=PebbleSDK-2.3
 
-- 
cgit v1.2.3