From 3115b6c76236517ca6d10e54a1e34965c340531f Mon Sep 17 00:00:00 2001
From: Carlos Martín Nieto <cmn@dwim.me>
Date: Sun, 28 Jun 2015 01:32:59 +0200
Subject: travis: allow containerized builds

These builds should be quicker and faster. We don't need sudo, so write
that down for Travis to move us to these builds.
---
 .travis.yml | 2 ++
 1 file changed, 2 insertions(+)

(limited to '.travis.yml')

diff --git a/.travis.yml b/.travis.yml
index f8b7e93..9341639 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,5 +1,7 @@
 language: go
 
+sudo: false
+
 install:
   - cd "${HOME}"
   - wget -O libgit2-0.22.1.tar.gz https://github.com/libgit2/libgit2/archive/v0.22.1.tar.gz
-- 
cgit v1.2.3


From 5f3a9d76b86efa91d8f1ee26277484419bc95f8d Mon Sep 17 00:00:00 2001
From: Carlos Martín Nieto <cmn@dwim.me>
Date: Sun, 28 Jun 2015 13:17:14 +0200
Subject: travis: don't install libgit2 for 'next' branch

We have our own libgit2 in a submodule, so this is unnecessary. While in
the area, update which version of libgit2 would be downloaded and remove
unnecessary CMake flags.
---
 .travis.yml               |  9 +--------
 script/install-libgit2.sh | 21 +++++++++++++++++++++
 2 files changed, 22 insertions(+), 8 deletions(-)
 create mode 100644 script/install-libgit2.sh

(limited to '.travis.yml')

diff --git a/.travis.yml b/.travis.yml
index 9341639..fb080b9 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,14 +2,7 @@ language: go
 
 sudo: false
 
-install:
-  - cd "${HOME}"
-  - wget -O libgit2-0.22.1.tar.gz https://github.com/libgit2/libgit2/archive/v0.22.1.tar.gz
-  - tar -xzvf libgit2-0.22.1.tar.gz
-  - cd libgit2-0.22.1 && mkdir build && cd build
-  - cmake -DTHREADSAFE=ON -DBUILD_CLAR=OFF -DCMAKE_C_FLAGS=-fPIC -DCMAKE_BUILD_TYPE="RelWithDebInfo" -DCMAKE_INSTALL_PREFIX=/usr/local .. && make && sudo make install
-  - sudo ldconfig
-  - cd "${TRAVIS_BUILD_DIR}"
+install: ./script/install-libgit2.sh
 
 go:
   - 1.1
diff --git a/script/install-libgit2.sh b/script/install-libgit2.sh
new file mode 100644
index 0000000..a6c3202
--- /dev/null
+++ b/script/install-libgit2.sh
@@ -0,0 +1,21 @@
+#!/bin/sh
+
+#
+# Install libgit2 to git2go in dynamic mode on Travis
+#
+
+set -ex
+
+# We don't want to build libgit2 on the next branch, as we carry a
+# submodule with the exact version we support
+if [ "x$TRAVIS_BRANCH" = "xnext" ]; then
+    exit 0
+fi
+
+cd "${HOME}"
+wget -O libgit2-0.22.3.tar.gz https://github.com/libgit2/libgit2/archive/v0.22.1.tar.gz
+tar -xzvf libgit2-0.22.3.tar.gz
+cd libgit2-0.22.1 && mkdir build && cd build
+cmake -DTHREADSAFE=ON -DBUILD_CLAR=OFF -DCMAKE_BUILD_TYPE="RelWithDebInfo" .. && make && sudo make install
+sudo ldconfig
+cd "${TRAVIS_BUILD_DIR}"
-- 
cgit v1.2.3


From ff6d4a7dfde18dcf330143980c66f426518b8061 Mon Sep 17 00:00:00 2001
From: Carlos Martín Nieto <cmn@dwim.me>
Date: Tue, 4 Aug 2015 15:01:17 +0200
Subject: We do require sudo on Travis

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to '.travis.yml')

diff --git a/.travis.yml b/.travis.yml
index fb080b9..209d89f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,6 +1,6 @@
 language: go
 
-sudo: false
+sudo: required
 
 install: ./script/install-libgit2.sh
 
-- 
cgit v1.2.3


From 2743bbfca3963e2a1cc21513b7ab9e8e8af70bf2 Mon Sep 17 00:00:00 2001
From: Carlos Martín Nieto <cmn@dwim.me>
Date: Mon, 31 Aug 2015 15:36:20 +0200
Subject: Test against Go 1.5

---
 .travis.yml | 1 +
 1 file changed, 1 insertion(+)

(limited to '.travis.yml')

diff --git a/.travis.yml b/.travis.yml
index 209d89f..f796389 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -9,6 +9,7 @@ go:
   - 1.2
   - 1.3
   - 1.4
+  - 1.5
   - tip
 
 matrix:
-- 
cgit v1.2.3