From a7d785bbcc925dfd7090b611b90934e87111087c Mon Sep 17 00:00:00 2001
From: "Gavin M. Roy" <gavinr@aweber.com>
Date: Thu, 16 Jul 2015 23:52:55 -0400
Subject: [PATCH] Update the test/build config/script

---
 .travis.yml              | 26 ++++++++++++++------------
 travis-umbrella-setup.sh | 19 +++++++++----------
 2 files changed, 23 insertions(+), 22 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 28aa66c..7552b27 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,29 +1,31 @@
+sudo: false
 language: erlang
 otp_release:
-- 17.4
+  - 17.5
+addons:
+  apt:
+    packages:
+      - xsltproc
 env:
-- BUILD_DIR=$HOME/rabbitmq-public-umbrella RABBIT_TAG=v3_5_1
+  - BUILD_DIR=$HOME/rabbitmq-public-umbrella RABBIT_TAG=v3_5_3 BUILD_VERSION=v3.5.x
 before_install:
-- $TRAVIS_BUILD_DIR/travis-umbrella-setup.sh
-install:
-- sudo apt-get update -qq
-- sudo apt-get install -qq -y xsltproc
+  - "$TRAVIS_BUILD_DIR/travis-umbrella-setup.sh"
 script: cd $BUILD_DIR/pgsql-listen-exchange && make test
 after_script:
-- rm -rf $BUILD_DIR/pgsql-listen-exchange
+  - rm -rf $BUILD_DIR/pgsql-listen-exchange
 before_deploy:
-- cd $BUILD_DIR/pgsql-listen-exchange
-- VERSION=$TRAVIS_TAG make
+  - cd $BUILD_DIR/pgsql-listen-exchange
+  - VERSION=$TRAVIS_TAG make
+  - cd $BUILD_DIR/pgsql-listen-exchange/dist && zip pgsql-listen-exchange-${TRAVIS_TAG}.zip epgsql*ez pgsql*ez
 cache:
   apt: true
   directories:
-  - $BUILD_DIR
+    - $BUILD_DIR
 deploy:
   provider: releases
   api_key:
     secure: tqI4Ted0Qp68oHqQ/hXvvsrR0lOB5c6eLLOuFb/HlAJMNKMs6yPw5Z4YY1ldVZsOhr5V7yzkb3yKta0PFXgNIaLwA7vsq9nzgF4cbxLScyzlcb7Sx/7Avr16AOQxiz13NCKDLi64AE+1rUCqvJfAtexQ98Ls/zzzBnBI81t/yOs=
-  file: $BUILD_DIR/pgsql-listen-exchange/dist/pgsql_listen_exchange-${TRAVIS_TAG}.ez
+  file: $BUILD_DIR/pgsql-listen-exchange/dist/pgsql-listen-exchange-${TRAVIS_TAG}.zip
   on:
     tags: true
     repo: aweber/pgsql-listen-exchange
-
diff --git a/travis-umbrella-setup.sh b/travis-umbrella-setup.sh
index 34f6b6a..da4d752 100755
--- a/travis-umbrella-setup.sh
+++ b/travis-umbrella-setup.sh
@@ -1,17 +1,16 @@
 #!/bin/bash
 BUILD_DIR=${BUILD_DIR:-${HOME}/rabbitmq-public-umbrella}
-RABBIT_TAG=${RABBIT_TAG:-v3_5_1}
+RABBIT_TAG=${RABBIT_TAG:-v3_5_3}
 echo "Build dir: ${BUILD_DIR}"
 echo "Travis build dir: ${TRAVIS_BUILD_DIR}"
-if [ ! -d $BUILD_DIR ]; then
-    git clone https://github.com/rabbitmq/rabbitmq-public-umbrella.git $BUILD_DIR
-    cd $BUILD_DIR
-    make co
+
+if [ -d $BUILD_DIR ]; then
+    rm -rf $BUILD_DIR
 fi
+git clone https://github.com/rabbitmq/rabbitmq-public-umbrella.git $BUILD_DIR
 cd $BUILD_DIR
-make BRANCH=rabbitmq_${RABBIT_TAG} up_c
-if [ ! -d "$BUILD_DIR/epgsql-wrapper" ]; then
-    git clone https://github.com/gmr/epgsql-wrapper.git
-fi
-rm -rf ${BUILD_DIR}/rabbitmq-public-umbrella
+git checkout -b rabbitmq_${RABBIT_TAG}
+git pull origin rabbitmq_${RABBIT_TAG}
+make co
+git clone https://github.com/gmr/epgsql-wrapper.git
 cp -r ${TRAVIS_BUILD_DIR} ${BUILD_DIR}/