Skip to content

Commit c814030

Browse files
committed
Correcting build issues on Travis
1 parent 1652983 commit c814030

File tree

3 files changed

+22
-19
lines changed

3 files changed

+22
-19
lines changed

.travis.yml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,6 @@ matrix:
66
dist: trusty
77
sudo: required
88
dotnet: 1.0.1
9-
# Disabled temporarily due to Travis OSX issues
10-
# - os: osx # OSX 10.11
11-
# osx_image: xcode7.3
12-
# dotnet: 1.0.1
139

1410
script:
1511
- ./build.sh

build.sh

Lines changed: 20 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,26 @@
11
#!/bin/bash
22

3-
# Ensure any exit code exits TravisCI
4-
set -e
3+
set -e
54

5+
export DOTNET_INSTALL_DIR="$PWD/.dotnetcli"
6+
DotnetCliVersion=${CLI_VERSION:="1.0.1"}
7+
install_script_url=https://raw.githubusercontent.com/dotnet/cli/rel/1.0.0/scripts/obtain/dotnet-install.sh
8+
curl -sSL $install_script_url | bash /dev/stdin --version "$DotnetCliVersion" --install-dir "$DOTNET_INSTALL_DIR"
9+
export PATH="$DOTNET_INSTALL_DIR:$PATH"
10+
11+
# See issue https://github.com/NuGet/Home/issues/2163
12+
ulimit -n 2048
13+
14+
dotnet --info
615
dotnet restore
7-
for path in src/*/project.json; do
8-
dirname="$(dirname "${path}")"
9-
dotnet build ${dirname}
10-
done
1116

12-
for path in sample/project.json; do
13-
dirname="$(dirname "${path}")"
14-
dotnet build ${dirname}
15-
done
17+
for path in src/**/*.csproj; do
18+
dotnet build -f netstandard1.0 -c Release ${path}
19+
dotnet build -f netstandard1.3 -c Release ${path}
20+
done
21+
22+
for path in test/*.Tests/*.csproj; do
23+
dotnet test -f netcoreapp1.0 -c Release ${path}
24+
done
1625

17-
for path in test/Serilog.Sinks.Splunk.Tests/project.json; do
18-
dirname="$(dirname "${path}")"
19-
dotnet build ${dirname} -f netcoreapp1.0 -c Release
20-
dotnet test ${dirname} -f netcoreapp1.0 -c Release
21-
done
26+
dotnet build -f netcoreapp1.0 -c Release sample/Sample.csproj

serilog-sinks-splunk.sln

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{7A774CBB-A6E
77
EndProject
88
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "assets", "assets", "{B9B13339-749C-4098-8845-780ED4FA488A}"
99
ProjectSection(SolutionItems) = preProject
10+
.travis.yml = .travis.yml
11+
appveyor.yml = appveyor.yml
1012
Build.ps1 = Build.ps1
1113
build.sh = build.sh
1214
CHANGES.md = CHANGES.md

0 commit comments

Comments
 (0)