Browse Source

Add missing dependencies to travis configuration.

Tim Burks 9 years ago
parent
commit
a7927827eb
2 changed files with 29 additions and 7 deletions
  1. 26 5
      .travis-install.sh
  2. 3 2
      .travis.yml

+ 26 - 5
.travis-install.sh

@@ -1,15 +1,36 @@
 #!/bin/sh
 
+#
+# Install dependencies that aren't available as Ubuntu packages.
+#
+# Everything goes into $HOME/local. 
+#
+# Scripts should add 
+# - $HOME/local/bin to PATH 
+# - $HOME/local/lib to LD_LIBRARY_PATH
+#
+
+cd
+mkdir -p local
+
+# Install swift
 SWIFT_BRANCH=swift-3.0.2-release
 SWIFT_VERSION=swift-3.0.2-RELEASE
 SWIFT_PLATFORM=ubuntu14.04
 SWIFT_URL=https://swift.org/builds/$SWIFT_BRANCH/$(echo "$SWIFT_PLATFORM" | tr -d .)/$SWIFT_VERSION/$SWIFT_VERSION-$SWIFT_PLATFORM.tar.gz
 
 echo $SWIFT_URL
-pwd
 
-cd
-pwd
-mkdir -p swift
 curl -fSsL $SWIFT_URL -o swift.tar.gz 
-tar -xzf swift.tar.gz --strip-components=2 --directory=swift
+tar -xzf swift.tar.gz --strip-components=2 --directory=local
+
+# Install protoc
+PROTOC_URL=https://github.com/google/protobuf/releases/download/v3.2.0rc2/protoc-3.2.0rc2-linux-x86_64.zip
+
+echo $PROTOC_URL
+
+curl -fSsL $PROTOC_URL -o protoc.zip
+unzip protoc.zip -d local
+
+# Verify installation
+find local

+ 3 - 2
.travis.yml

@@ -18,12 +18,13 @@ addons:
     - libssl-dev 
     - uuid-dev
     - curl
+    - unzip
 
 install: ./.travis-install.sh
 
 script: 
-  - export PATH=$HOME/swift/bin:$PATH
-  - export LD_LIBRARY_PATH=$HOME/swift/lib
+  - export PATH=.:$HOME/local/bin:$PATH
+  - export LD_LIBRARY_PATH=$HOME/local/lib
   - make test
   - cd Plugin
   - make test