From acc05926f7d21547a8c9de0bb08d3b0b498a6769 Mon Sep 17 00:00:00 2001 From: Dmitri Shuralyov Date: Thu, 16 Apr 2015 18:45:53 -0700 Subject: Avoid installing script binary to user's $GOPATH/bin. --- script/check-MakeGitError-thread-lock.go | 2 ++ 1 file changed, 2 insertions(+) (limited to 'script') diff --git a/script/check-MakeGitError-thread-lock.go b/script/check-MakeGitError-thread-lock.go index f6b01b3..77411f7 100644 --- a/script/check-MakeGitError-thread-lock.go +++ b/script/check-MakeGitError-thread-lock.go @@ -1,3 +1,5 @@ +// +build ignore + package main import ( -- cgit v1.2.3 From 5f3a9d76b86efa91d8f1ee26277484419bc95f8d Mon Sep 17 00:00:00 2001 From: Carlos Martín Nieto 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 'script') 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 2d6b1ebd4c8f98d3946920003796b16b702d70c8 Mon Sep 17 00:00:00 2001 From: Carlos Martín Nieto Date: Sun, 28 Jun 2015 13:19:03 +0200 Subject: travis: make the script executable --- script/install-libgit2.sh | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 script/install-libgit2.sh (limited to 'script') diff --git a/script/install-libgit2.sh b/script/install-libgit2.sh old mode 100644 new mode 100755 -- cgit v1.2.3 From 1ea99658246673770b21f8848e257132a29e78d1 Mon Sep 17 00:00:00 2001 From: Carlos Martín Nieto Date: Mon, 31 Aug 2015 14:01:06 +0200 Subject: Install v23 on Travis --- script/install-libgit2.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'script') diff --git a/script/install-libgit2.sh b/script/install-libgit2.sh index a6c3202..9bf6b37 100755 --- a/script/install-libgit2.sh +++ b/script/install-libgit2.sh @@ -13,9 +13,9 @@ if [ "x$TRAVIS_BRANCH" = "xnext" ]; then 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 +wget -O libgit2-0.23.1.tar.gz https://github.com/libgit2/libgit2/archive/v0.23.1.tar.gz +tar -xzvf libgit2-0.23.1.tar.gz +cd libgit2-0.23.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