From 85ad800a778a0995ed6edcc60e0e0437872710d6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20Mart=C3=ADn=20Nieto?= Date: Tue, 12 Apr 2016 19:31:43 +0200 Subject: [PATCH] Use Travis' csharp language setup Use the configuration Travis already knows about to reduce how much custom code we're running. As it's now easy to do, test on both 3.12 and 4.2 versions of mono. This also has the advantage of making us test on both systems with the same version. --- .travis.yml | 9 +++++---- CI/travis.linux.install.deps.sh | 10 ---------- CI/travis.osx.install.deps.sh | 10 ---------- build.libgit2sharp.sh | 4 ---- 4 files changed, 5 insertions(+), 28 deletions(-) delete mode 100755 CI/travis.linux.install.deps.sh delete mode 100755 CI/travis.osx.install.deps.sh diff --git a/.travis.yml b/.travis.yml index 700fbd296..d0e35f585 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,10 @@ # Travis-CI Build for libgit2sharp # see travis-ci.org for details -language: c +language: csharp +mono: + - 3.12.0 + - 4.2.3 os: - osx @@ -14,11 +17,9 @@ env: before_install: - date -u - uname -a - - export PATH=/opt/mono/bin:$PATH - env | sort -# Make sure CMake and Mono are installed -install: ./CI/travis.${TRAVIS_OS_NAME}.install.deps.sh +solution: LibGit2Sharp.sln # Build libgit2, LibGit2Sharp and run the tests script: diff --git a/CI/travis.linux.install.deps.sh b/CI/travis.linux.install.deps.sh deleted file mode 100755 index 365fc51a6..000000000 --- a/CI/travis.linux.install.deps.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash -set -ev - -sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF - -echo "deb http://download.mono-project.com/repo/debian wheezy/snapshots/3.12.0 main" | sudo tee /etc/apt/sources.list.d/mono-xamarin.list -echo "deb http://download.mono-project.com/repo/debian wheezy-libtiff-compat main" | sudo tee -a /etc/apt/sources.list.d/mono-xamarin.list - -sudo apt-get update -sudo apt-get install mono-devel cmake diff --git a/CI/travis.osx.install.deps.sh b/CI/travis.osx.install.deps.sh deleted file mode 100755 index c6621b735..000000000 --- a/CI/travis.osx.install.deps.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash -set -ev - -MONO_VER=3.6.0 - -brew update -which cmake || brew install cmake - -wget "http://download.mono-project.com/archive/${MONO_VER}/macos-10-x86/MonoFramework-MDK-${MONO_VER}.macos10.xamarin.x86.pkg" -sudo installer -pkg "MonoFramework-MDK-${MONO_VER}.macos10.xamarin.x86.pkg" -target / diff --git a/build.libgit2sharp.sh b/build.libgit2sharp.sh index acf425a29..52b30fad1 100755 --- a/build.libgit2sharp.sh +++ b/build.libgit2sharp.sh @@ -9,10 +9,6 @@ EXTRADEFINE="$1" # working directory in its library search path, so it works without this value. export LD_LIBRARY_PATH=. -# Required for NuGet package restore to run. -mozroots --import --sync - -mono Lib/NuGet/NuGet.exe restore LibGit2Sharp.sln xbuild CI/build.msbuild /target:Deploy /property:ExtraDefine="$EXTRADEFINE" exit $?