From 695ffaba1a512b04f2f73cc2be52c0787d1a99e5 Mon Sep 17 00:00:00 2001 From: Matthew Erbs Date: Thu, 4 Apr 2019 19:15:08 +1000 Subject: [PATCH 1/2] Removed TravisCI and replaced with AppVeyor for Linux builds. --- .travis.yml | 13 ------------- Build.ps1 | 3 +++ appveyor.yml | 17 +++++++++++++---- build.sh | 3 +++ 4 files changed, 19 insertions(+), 17 deletions(-) delete mode 100644 .travis.yml diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 043a30f89..000000000 --- a/.travis.yml +++ /dev/null @@ -1,13 +0,0 @@ -language: csharp -dotnet: 2.1.4 - -matrix: - include: - - os: osx # osx_image: xcode8.3 Default Xcode 8.3.3 OS X 10.12 1.8.0_112-b16 - osx_image: xcode9.2 - - os: linux - dist: trusty - sudo: required - group: edge -script: - - ./build.sh diff --git a/Build.ps1 b/Build.ps1 index 4c23796bb..9551cc527 100644 --- a/Build.ps1 +++ b/Build.ps1 @@ -1,5 +1,8 @@ echo "build: Build started" +& dotnet --info +& dotnet --list-sdks + Push-Location $PSScriptRoot if(Test-Path .\artifacts) { diff --git a/appveyor.yml b/appveyor.yml index 2fdc81059..3a257b5db 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,13 +1,22 @@ version: '{build}' skip_tags: true -image: Visual Studio 2017 +image: + - Visual Studio 2017 + - Ubuntu configuration: Release test: off build_script: -- ps: ./Build.ps1 -- ps: ./BuildNativeUWP.ps1 + - ps: ./Build.ps1 + - ps: ./BuildNativeUWP.ps1 +for: +- + matrix: + only: + - image: Ubuntu + build_script: + - sh build.sh artifacts: -- path: artifacts/Serilog.*.nupkg + - path: artifacts/Serilog.*.nupkg deploy: - provider: NuGet api_key: diff --git a/build.sh b/build.sh index da542a88a..573c706eb 100755 --- a/build.sh +++ b/build.sh @@ -2,13 +2,16 @@ set -e dotnet --info +dotnet --list-sdks dotnet restore +echo "🤖 Attempting to build..." for path in src/**/*.csproj; do dotnet build -f netstandard1.0 -c Release ${path} dotnet build -f netstandard1.3 -c Release ${path} done +echo "🤖 Running tests..." for path in test/*.Tests/*.csproj; do dotnet test -f netcoreapp2.0 -c Release ${path} done From 4561e4087ed9d59719c3f88de313d5f964729a64 Mon Sep 17 00:00:00 2001 From: Matthew Erbs Date: Thu, 4 Apr 2019 19:31:20 +1000 Subject: [PATCH 2/2] Removed README notes on TravisCI. --- README.md | 8 ++++---- Serilog.sln | 1 - 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 2bc69e03c..e1dc83464 100644 --- a/README.md +++ b/README.md @@ -111,9 +111,9 @@ When contributing please keep in mind our [Code of Conduct](CODE_OF_CONDUCT.md). ### Detailed build 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) | [![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) +Branch | AppVeyor +------------- | ------------- +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) _Serilog is copyright © 2013-2018 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/)._ diff --git a/Serilog.sln b/Serilog.sln index 71efa2efd..0f78e6978 100644 --- a/Serilog.sln +++ b/Serilog.sln @@ -5,7 +5,6 @@ MinimumVisualStudioVersion = 10.0.40219.1 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "assets", "assets", "{E9D1B5E1-DEB9-4A04-8BAB-24EC7240ADAF}" ProjectSection(SolutionItems) = preProject .editorconfig = .editorconfig - .travis.yml = .travis.yml appveyor.yml = appveyor.yml Build.ps1 = Build.ps1 build.sh = build.sh