-print

[VerusCoin.git] / .travis.yml

diff --git a/.travis.yml b/.travis.yml
index ecb31ef0f051bc19bee5ef6bb52d2ae6c9aa7667..ac331dcf9a5c81ee7b82425df47fb7ac36e81dc6 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,3 +1,28 @@
+<<<<<<< HEAD
+language: cpp
+
+compiler:
+  - gcc
+  
+before_install:
+  - sudo add-apt-repository --yes ppa:ubuntu-sdk-team/ppa
+  - sudo apt-get update -qq
+  - sudo apt-get install build-essential pkg-config libcurl3-gnutls-dev libc6-dev libevent-dev m4 g++-multilib autoconf libtool ncurses-dev unzip git python zlib1g-dev wget bsdmainutils automake libssl-dev libprotobuf-dev protobuf-compiler libdb++-dev ntp ntpdate
+#install:
+ 
+script: 
+ - ./zcutil/build.sh -j 5
+
+notifications:
+  irc:
+    channels:
+      - "chat.freenode.net#komodoplatform"
+    template:
+      - "%{repository}/%{branch} (%{commit} - %{author}): %{message}"
+      - "Alt Message : %{repository_slug} - (%{commit} - %{author}): %{message}, Build Time: %{duration}"
+      - "Change view : %{compare_url}"
+      - "Build details : %{build_url}"
+=======
 # errata:
 # - A travis bug causes caches to trample eachother when using the same
 #   compiler key (which we don't use anyway). This is worked around for now by
@@ -77,3 +102,4 @@ script:
     - if [ "$RUN_TESTS" = "true" ]; then qa/pull-tester/rpc-tests.sh; fi
 after_script:
     - if [ "$TRAVIS_PULL_REQUEST" != "false" ]; then (echo "Upload goes here. Something like: scp -r $BASE_OUTDIR server" || echo "upload failed"); fi
+>>>>>>> zcash/master