Skip to content

Commit

Permalink
Fix travis build, remove OpenCover
Browse files Browse the repository at this point in the history
  • Loading branch information
adamchester committed Mar 4, 2017
1 parent 273c191 commit df69837
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 8 deletions.
6 changes: 4 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,12 @@ matrix:
- os: linux # Ubuntu 14.04
dist: trusty
sudo: required
dotnet: 1.0.0-rc4-004771
dotnet: 1.0.0-preview2-003121
CLI_VERSION: 1.0.0-rc4-004771
- os: osx # OSX 10.11
osx_image: xcode7.3
dotnet: 1.0.0-rc4-004771
dotnet: 1.0.0-preview2-003121
CLI_VERSION: 1.0.0-rc4-004771

script:
- ./build.sh
6 changes: 0 additions & 6 deletions appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,6 @@ install:
- ps: $env:Path = "$env:DOTNET_INSTALL_DIR;$env:Path"
build_script:
- ps: ./Build.ps1
test_script:
- nuget.exe install OpenCover -ExcludeVersion
- OpenCover\tools\OpenCover.Console.exe -register:user -filter:"+[Serilog]*" -target:"dotnet.exe" "-targetargs:test test\Serilog.Tests\Serilog.Tests.csproj" -returntargetcode -hideskipped:All -output:coverage.xml
- "SET PATH=C:\\Python34;C:\\Python34\\Scripts;%PATH%"
- pip install codecov
- codecov -f "coverage.xml"
artifacts:
- path: artifacts/Serilog.*.nupkg
deploy:
Expand Down
1 change: 1 addition & 0 deletions build.cmd
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
@powershell .\Build.ps1 %*
8 changes: 8 additions & 0 deletions build.sh
Original file line number Diff line number Diff line change
@@ -1,5 +1,13 @@
#!/bin/bash
export DOTNET_INSTALL_DIR="$PWD/.dotnetcli"
DotnetCliVersion=${CLI_VERSION:="1.0.0-rc4-004771"}
install_script_url=https://raw.githubusercontent.com/dotnet/cli/rel/1.0.0/scripts/obtain/dotnet-install.sh
curl -sSL $install_script_url | bash /dev/stdin --version "$DotnetCliVersion" --install-dir "$DOTNET_INSTALL_DIR"
export PATH="$DOTNET_INSTALL_DIR:$PATH"

dotnet --info
dotnet restore

for path in src/**/*.csproj; do
dotnet build -c Release ${path}
done
Expand Down

0 comments on commit df69837

Please sign in to comment.