From c567e4814a162b0434084436b15dfb5d53920e7a Mon Sep 17 00:00:00 2001 From: Stephen Halter Date: Wed, 30 Mar 2016 12:01:53 -0700 Subject: [PATCH] Clean up Travis builds - No longer build libuv in .travis.yml - The Ubuntu libuv build should now be taken from http://github.com/aspnet/libuv-build - Remove unneeded packages from .travis.yml - Stop skipping mono tests --- .travis.yml | 15 --------------- samples/LargeResponseApp/project.json | 4 ++++ samples/SampleApp/project.json | 4 ++++ .../project.json | 4 ++++ .../project.json | 4 ++++ 5 files changed, 16 insertions(+), 15 deletions(-) diff --git a/.travis.yml b/.travis.yml index 6108295a27..16c27f88b9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,22 +4,7 @@ dist: trusty addons: apt: packages: - - gettext - - libcurl4-openssl-dev - - libicu-dev - - libssl-dev - libunwind8 - - zlib1g -env: - - KOREBUILD_TEST_SKIPMONO=true -install: - - curl -sSL https://github.com/libuv/libuv/archive/v1.4.2.tar.gz | tar zxfv - -C /tmp && cd /tmp/libuv-1.4.2/ - - sh autogen.sh - - ./configure --prefix=$HOME/libuvinstall - - make - - make install - - export LD_LIBRARY_PATH="$HOME/libuvinstall/lib" - - cd $OLDPWD mono: - 4.0.5 os: diff --git a/samples/LargeResponseApp/project.json b/samples/LargeResponseApp/project.json index d25c094244..e5d75bf37b 100644 --- a/samples/LargeResponseApp/project.json +++ b/samples/LargeResponseApp/project.json @@ -5,6 +5,10 @@ "version": "1.0.0-*", "type": "build" }, + "Microsoft.AspNetCore.Internal.libuv-Linux": { + "version": "1.0.0-*", + "type": "build" + }, "Microsoft.AspNetCore.Internal.libuv-Windows": { "version": "1.0.0-*", "type": "build" diff --git a/samples/SampleApp/project.json b/samples/SampleApp/project.json index 2e217c4e86..546670be0b 100644 --- a/samples/SampleApp/project.json +++ b/samples/SampleApp/project.json @@ -5,6 +5,10 @@ "version": "1.0.0-*", "type": "build" }, + "Microsoft.AspNetCore.Internal.libuv-Linux": { + "version": "1.0.0-*", + "type": "build" + }, "Microsoft.AspNetCore.Internal.libuv-Windows": { "version": "1.0.0-*", "type": "build" diff --git a/test/Microsoft.AspNetCore.Server.Kestrel.FunctionalTests/project.json b/test/Microsoft.AspNetCore.Server.Kestrel.FunctionalTests/project.json index 6c48e9a588..deaf0e6415 100644 --- a/test/Microsoft.AspNetCore.Server.Kestrel.FunctionalTests/project.json +++ b/test/Microsoft.AspNetCore.Server.Kestrel.FunctionalTests/project.json @@ -10,6 +10,10 @@ "version": "1.0.0-*", "type": "build" }, + "Microsoft.AspNetCore.Internal.libuv-Linux": { + "version": "1.0.0-*", + "type": "build" + }, "Microsoft.AspNetCore.Internal.libuv-Windows": { "version": "1.0.0-*", "type": "build" diff --git a/test/Microsoft.AspNetCore.Server.KestrelTests/project.json b/test/Microsoft.AspNetCore.Server.KestrelTests/project.json index 6ccf5d02ee..9d1bad57b0 100644 --- a/test/Microsoft.AspNetCore.Server.KestrelTests/project.json +++ b/test/Microsoft.AspNetCore.Server.KestrelTests/project.json @@ -10,6 +10,10 @@ "version": "1.0.0-*", "type": "build" }, + "Microsoft.AspNetCore.Internal.libuv-Linux": { + "version": "1.0.0-*", + "type": "build" + }, "Microsoft.AspNetCore.Internal.libuv-Windows": { "version": "1.0.0-*", "type": "build"