Skip to content

Commit 1e1869b

Browse files
author
Sergey Komisarchik
committed
ci/cd adjustments:
- enabled deterministic build, reenabled symbol publishing - fixed PackageProjectUrl - removed Travis, added Linux build into the AppVeyor matrix
1 parent cce4f90 commit 1e1869b

File tree

5 files changed

+28
-32
lines changed

5 files changed

+28
-32
lines changed

.travis.yml

Lines changed: 0 additions & 11 deletions
This file was deleted.

Build.ps1

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ foreach ($src in dir src/*) {
2020

2121
echo "build: Packaging project in $src"
2222

23-
& dotnet pack -c Release -o ..\..\artifacts --version-suffix=$suffix
23+
& dotnet pack -c Release -o ..\..\artifacts --version-suffix=$suffix -p:ContinuousIntegrationBuild=true
2424
if ($LASTEXITCODE -ne 0) { exit 1 }
2525

2626
Pop-Location
@@ -42,10 +42,25 @@ foreach ($test in dir test/*.Tests) {
4242

4343
echo "build: Testing project in $test"
4444

45-
& dotnet test -c Release
45+
if ($PSVersionTable.Platform -eq "Unix") {
46+
& dotnet test -c Release -f netcoreapp2.0
47+
& dotnet test -c Release -f netcoreapp3.1
48+
} else {
49+
& dotnet test -c Release
50+
}
51+
4652
if ($LASTEXITCODE -ne 0) { exit 3 }
4753

4854
Pop-Location
4955
}
5056

57+
if ($PSVersionTable.Platform -eq "Unix") {
58+
Push-Location sample/Sample
59+
60+
& dotnet run -f netcoreapp2.0 -c Release --run-once
61+
if ($LASTEXITCODE -ne 0) { exit 4 }
62+
63+
Pop-Location
64+
}
65+
5166
Pop-Location

appveyor.yml

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,18 @@
11
version: '{build}'
22
skip_tags: true
3-
image: Visual Studio 2019
3+
image:
4+
- Visual Studio 2019
5+
- Ubuntu1604
46
configuration: Release
57
build_script:
68
- ps: ./Build.ps1
9+
for:
10+
-
11+
matrix:
12+
only:
13+
- image: Ubuntu1604
14+
build_script:
15+
- pwsh ./Build.ps1
716
test: off
817
artifacts:
918
- path: artifacts/Serilog.*.nupkg
@@ -12,7 +21,6 @@ deploy:
1221
- provider: NuGet
1322
api_key:
1423
secure: b7jxRe5kR3kuxMrmdDuN0jvaaWWHwtFRnAwFZZV6MdaorwUhASR/Ey1gPn6vXwND
15-
skip_symbols: true
1624
on:
1725
branch: /^(master|dev)$/
1826
- provider: GitHub

build.sh

Lines changed: 0 additions & 17 deletions
This file was deleted.

serilog-settings-configuration.sln

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "assets", "assets", "{62D0B9
1313
Build.ps1 = Build.ps1
1414
CHANGES.md = CHANGES.md
1515
Directory.Build.props = Directory.Build.props
16+
global.json = global.json
1617
assets\icon.png = assets\icon.png
1718
LICENSE = LICENSE
1819
README.md = README.md

0 commit comments

Comments
 (0)