From 58ef79fb6a9d3fc055cb43d03630e0a3101d9aa6 Mon Sep 17 00:00:00 2001
From: Rafa de la Torre <rtorre@cartodb.com>
Date: Tue, 9 Aug 2016 15:42:01 +0200
Subject: [PATCH 1/3] Script to check whether a branch is up to date

---
 .travis.yml                     |  1 +
 check-up-to-date-with-master.sh | 16 ++++++++++++++++
 2 files changed, 17 insertions(+)
 create mode 100755 check-up-to-date-with-master.sh

diff --git a/.travis.yml b/.travis.yml
index b9196cb..d3eb863 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,6 +1,7 @@
 language: c
 
 before_install:
+  - ./check-up-to-date-with-master.sh
   - sudo apt-get -y install python-pip
 
   - sudo apt-get -y install python-software-properties
diff --git a/check-up-to-date-with-master.sh b/check-up-to-date-with-master.sh
new file mode 100755
index 0000000..af4b8b4
--- /dev/null
+++ b/check-up-to-date-with-master.sh
@@ -0,0 +1,16 @@
+#!/bin/bash
+
+# Add remote-master
+git remote add -t master remote-master https://github.com/CartoDB/crankshaft.git
+
+# Fetch master reference
+git fetch --depth=1 remote-master master
+
+# Compare HEAD with master
+# NOTE: travis by default uses --depth=50 so we are actually checking that the tip
+# of the branch is no more than 50 commits away from master as well.
+git rev-list HEAD | grep $(git rev-parse remote-master/master) ||
+    { echo "Your branch is not up to date with latest release";
+      echo "Please update it by running the following:";
+      echo "    git fetch && git merge origin/develop";
+      false; }

From 84d3238d593f85567fa9f11e180fe69243877fa1 Mon Sep 17 00:00:00 2001
From: Rafa de la Torre <rtorre@cartodb.com>
Date: Tue, 9 Aug 2016 15:44:36 +0200
Subject: [PATCH 2/3] Split installation into its own phase

---
 .travis.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index d3eb863..9409590 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -48,6 +48,8 @@ before_install:
   # save the postgres port for later usage
   - sudo cat /etc/postgresql/9.5/main/postgresql.conf | grep ^port | grep -oh '[0-9]*' > .pg95.port
 
-script:
+install:
   - sudo make install
+
+script:
   - PGPORT=$(cat .pg95.port) make test || { cat src/pg/test/regression.diffs; false; }

From a148fc7d899201a37d67eac31983a65371c3ad7e Mon Sep 17 00:00:00 2001
From: Rafa de la Torre <rtorre@cartodb.com>
Date: Tue, 9 Aug 2016 15:45:45 +0200
Subject: [PATCH 3/3] Remove PGPORT hack

It is no longer needed as pg9.5 is installed in its standard port.
---
 .travis.yml | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 9409590..cfd9c52 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -45,11 +45,8 @@ before_install:
     | sudo tee /etc/postgresql/9.5/main/pg_hba.conf
   - sudo /etc/init.d/postgresql restart 9.5
 
-  # save the postgres port for later usage
-  - sudo cat /etc/postgresql/9.5/main/postgresql.conf | grep ^port | grep -oh '[0-9]*' > .pg95.port
-
 install:
   - sudo make install
 
 script:
-  - PGPORT=$(cat .pg95.port) make test || { cat src/pg/test/regression.diffs; false; }
+  - make test || { cat src/pg/test/regression.diffs; false; }