From c1a5841d22387051cbd8fa3eecf9c60695103476 Mon Sep 17 00:00:00 2001 From: Matthew Erbs Date: Tue, 31 May 2016 08:38:57 +1000 Subject: [PATCH 1/5] Travid build and reverted to loop in build.sh. --- .travis.yml | 44 ++++++++++++++++++++++++++++++++++++++++++++ build.sh | 23 +++++++++++------------ 2 files changed, 55 insertions(+), 12 deletions(-) create mode 100644 .travis.yml diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 000000000..98053ed3c --- /dev/null +++ b/.travis.yml @@ -0,0 +1,44 @@ +language: csharp + +#dotnet cli require Ubuntu 14.04 +sudo: required +dist: trusty + +#dotnet cli require OSX 10.10 +osx_image: xcode7.1 + +addons: + apt: + packages: + - gettext + - libcurl4-openssl-dev + - libicu-dev + - libssl-dev + - libunwind8 + - zlib1g + +os: + - osx + - linux + +env: + matrix: + - CLI_VERSION=Latest + +matrix: + allow_failures: + - env: CLI_VERSION=Latest + +before_install: + - if test "$TRAVIS_OS_NAME" == "osx"; then brew update; brew install openssl; brew link --force openssl; fi + # Download script to install dotnet cli + - curl -L --create-dirs https://raw.githubusercontent.com/dotnet/cli/rel/1.0.0/scripts/obtain/dotnet-install.sh -o ./scripts/obtain/install.sh + - find ./scripts -name "*.sh" -exec chmod +x {} \; + - export DOTNET_INSTALL_DIR="$PWD/.dotnetcli" + # use bash to workaround bug https://github.com/dotnet/cli/issues/1725 + - sudo bash ./scripts/obtain/install.sh --channel "preview" --version "$CLI_VERSION" --install-dir "$DOTNET_INSTALL_DIR" --no-path + # add dotnet to PATH + - export PATH="$DOTNET_INSTALL_DIR:$PATH" + +script: + - ./build.sh \ No newline at end of file diff --git a/build.sh b/build.sh index ef9dcc392..182b88a1f 100755 --- a/build.sh +++ b/build.sh @@ -1,14 +1,13 @@ #!/bin/bash - dotnet restore - -cd src/Serilog/ - -dotnet build -f netstandard1.0 -c Release -dotnet build -f netstandard1.3 -c Release - -cd ../.. -cd test/Serilog.Tests/ - -dotnet build -f netcoreapp1.0 -c Release -dotnet test -f netcoreapp1.0 -c Release \ No newline at end of file +for path in src/*/project.json; do + dirname="$(dirname "${path}")" + dotnet build ${dirname} -f netstandard1.0 -c Release + dotnet build ${dirname} -f netstandard1.3 -c Release +done + +for path in test/Serilog.Tests/project.json; do + dirname="$(dirname "${path}")" + dotnet build ${dirname} -f netcoreapp1.0 -c Release + dotnet test ${dirname} -f netcoreapp1.0 -c Release +done \ No newline at end of file From c61644fa5841c61eaf4e52535406a7c25471206f Mon Sep 17 00:00:00 2001 From: Matthew Erbs Date: Tue, 31 May 2016 08:45:17 +1000 Subject: [PATCH 2/5] Updated readme with travis badges. --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 3e79dae39..24913eb51 100644 --- a/README.md +++ b/README.md @@ -7,9 +7,9 @@ Serilog combines the best features of traditional and structured diagnostic logg Would you like to help make Serilog even better? We keep a list of issues that are approachable for newcomers under the [up-for-grabs](https://github.com/serilog/serilog/issues?labels=up-for-grabs&state=open) label! -Branch | Status +Branch | AppVeyor | Travis ------------- | ------------- -dev | [![Build status](https://ci.appveyor.com/api/projects/status/b9rm3l7kduryjgcj/branch/dev?svg=true)](https://ci.appveyor.com/project/serilog/serilog/branch/dev) -master | [![Build status](https://ci.appveyor.com/api/projects/status/b9rm3l7kduryjgcj/branch/master?svg=true)](https://ci.appveyor.com/project/serilog/serilog/branch/master) +dev | [![Build status](https://ci.appveyor.com/api/projects/status/b9rm3l7kduryjgcj/branch/dev?svg=true)](https://ci.appveyor.com/project/serilog/serilog/branch/dev) | [![Build Status](https://travis-ci.org/serilog/serilog.svg?branch=dev)](https://travis-ci.org/serilog/serilog) +master | [![Build status](https://ci.appveyor.com/api/projects/status/b9rm3l7kduryjgcj/branch/master?svg=true)](https://ci.appveyor.com/project/serilog/serilog/branch/master) | [![Build Status](https://travis-ci.org/serilog/serilog.svg?branch=master)](https://travis-ci.org/serilog/serilog) Copyright © 2015 Serilog Contributors - Provided under the [Apache License, Version 2.0](http://apache.org/licenses/LICENSE-2.0.html). Needle and thread logo a derivative of work by [Kenneth Appiah](http://www.kensets.com/). From 6ddc5ba0cc58f4df51d7a45342810ae069873ef9 Mon Sep 17 00:00:00 2001 From: Matthew Erbs Date: Tue, 31 May 2016 12:31:29 +1000 Subject: [PATCH 3/5] Corrected table structure --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 24913eb51..879caaeef 100644 --- a/README.md +++ b/README.md @@ -8,8 +8,8 @@ Serilog combines the best features of traditional and structured diagnostic logg Would you like to help make Serilog even better? We keep a list of issues that are approachable for newcomers under the [up-for-grabs](https://github.com/serilog/serilog/issues?labels=up-for-grabs&state=open) label! Branch | AppVeyor | Travis -------------- | ------------- +------------- | ------------- |------------- dev | [![Build status](https://ci.appveyor.com/api/projects/status/b9rm3l7kduryjgcj/branch/dev?svg=true)](https://ci.appveyor.com/project/serilog/serilog/branch/dev) | [![Build Status](https://travis-ci.org/serilog/serilog.svg?branch=dev)](https://travis-ci.org/serilog/serilog) master | [![Build status](https://ci.appveyor.com/api/projects/status/b9rm3l7kduryjgcj/branch/master?svg=true)](https://ci.appveyor.com/project/serilog/serilog/branch/master) | [![Build Status](https://travis-ci.org/serilog/serilog.svg?branch=master)](https://travis-ci.org/serilog/serilog) -Copyright © 2015 Serilog Contributors - Provided under the [Apache License, Version 2.0](http://apache.org/licenses/LICENSE-2.0.html). Needle and thread logo a derivative of work by [Kenneth Appiah](http://www.kensets.com/). +Copyright © 2016 Serilog Contributors - Provided under the [Apache License, Version 2.0](http://apache.org/licenses/LICENSE-2.0.html). Needle and thread logo a derivative of work by [Kenneth Appiah](http://www.kensets.com/). From 10b7db1423ffcb4290bad7c6913f85c67aebb1fe Mon Sep 17 00:00:00 2001 From: Matthew Erbs Date: Tue, 31 May 2016 18:52:22 +1000 Subject: [PATCH 4/5] Removed the target framework on lib build. --- build.sh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/build.sh b/build.sh index 182b88a1f..9cf05e9a0 100755 --- a/build.sh +++ b/build.sh @@ -1,13 +1,13 @@ #!/bin/bash dotnet restore for path in src/*/project.json; do - dirname="$(dirname "${path}")" - dotnet build ${dirname} -f netstandard1.0 -c Release - dotnet build ${dirname} -f netstandard1.3 -c Release + dirname="$(dirname "${path}")" + dotnet build ${dirname} -c Release + dotnet build ${dirname} -c Release done for path in test/Serilog.Tests/project.json; do - dirname="$(dirname "${path}")" + dirname="$(dirname "${path}")" dotnet build ${dirname} -f netcoreapp1.0 -c Release dotnet test ${dirname} -f netcoreapp1.0 -c Release -done \ No newline at end of file +done From 08608f612b4d43ddcb6f99554eeb46d58b9a77f2 Mon Sep 17 00:00:00 2001 From: Matthew Erbs Date: Tue, 31 May 2016 18:54:22 +1000 Subject: [PATCH 5/5] Updated README with correct year(s). --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 879caaeef..3f56f7572 100644 --- a/README.md +++ b/README.md @@ -12,4 +12,4 @@ Branch | AppVeyor | Travis dev | [![Build status](https://ci.appveyor.com/api/projects/status/b9rm3l7kduryjgcj/branch/dev?svg=true)](https://ci.appveyor.com/project/serilog/serilog/branch/dev) | [![Build Status](https://travis-ci.org/serilog/serilog.svg?branch=dev)](https://travis-ci.org/serilog/serilog) master | [![Build status](https://ci.appveyor.com/api/projects/status/b9rm3l7kduryjgcj/branch/master?svg=true)](https://ci.appveyor.com/project/serilog/serilog/branch/master) | [![Build Status](https://travis-ci.org/serilog/serilog.svg?branch=master)](https://travis-ci.org/serilog/serilog) -Copyright © 2016 Serilog Contributors - Provided under the [Apache License, Version 2.0](http://apache.org/licenses/LICENSE-2.0.html). Needle and thread logo a derivative of work by [Kenneth Appiah](http://www.kensets.com/). +Copyright © 2013-2016 Serilog Contributors - Provided under the [Apache License, Version 2.0](http://apache.org/licenses/LICENSE-2.0.html). Needle and thread logo a derivative of work by [Kenneth Appiah](http://www.kensets.com/).