Skip to content

Commit 2a5c9c2

Browse files
added X-plat PR validation (#121)
* added X-plat PR validation * deleted Docker build command * removed NBench installer
1 parent 2750c72 commit 2a5c9c2

File tree

2 files changed

+30
-15
lines changed

2 files changed

+30
-15
lines changed

build-system/pr-validation.yaml

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
# Pull request validation for Windows against the `dev` and `master` branches
2+
# See https://docs.microsoft.com/en-us/azure/devops/pipelines/yaml-schema for reference
3+
trigger:
4+
branches:
5+
include:
6+
- dev
7+
- master
8+
9+
pr:
10+
autoCancel: true # indicates whether additional pushes to a PR should cancel in-progress runs for the same PR. Defaults to true
11+
branches:
12+
include: [ dev, master ] # branch names which will trigger a build
13+
14+
name: $(Year:yyyy).$(Month).$(DayOfMonth)$(Rev:.r)
15+
16+
jobs:
17+
- template: azure-pipeline.template.yaml
18+
parameters:
19+
name: 'windows_pr'
20+
displayName: 'Windows PR Validation'
21+
vmImage: 'vs2017-win2016'
22+
scriptFileName: build.cmd
23+
scriptArgs: all
24+
- template: azure-pipeline.template.yaml
25+
parameters:
26+
name: 'linux_pr'
27+
displayName: 'Linux PR Validation'
28+
vmImage: 'ubuntu-16.04'
29+
scriptFileName: ./build.sh
30+
scriptArgs: all

build.ps1

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@ Param(
3030
)
3131

3232
$FakeVersion = "4.61.2"
33-
$NBenchVersion = "1.2.2"
3433
$DotNetChannel = "LTS";
3534
$DotNetVersion = "3.0.100";
3635
$DotNetInstallerUri = "https://dot.net/v1/dotnet-install.ps1";
@@ -115,20 +114,6 @@ if (!(Test-Path $FakeExePath)) {
115114
}
116115
}
117116

118-
###########################################################################
119-
# INSTALL NBench Runner
120-
###########################################################################
121-
122-
# Make sure NBench Runner has been installed.
123-
$NBenchDllPath = Join-Path $ToolPath "NBench.Runner/lib/net45/NBench.Runner.exe"
124-
if (!(Test-Path $NBenchDllPath)) {
125-
Write-Host "Installing NBench..."
126-
Invoke-Expression "&`"$NugetPath`" install NBench.Runner -ExcludeVersion -Version $NBenchVersion -OutputDirectory `"$ToolPath`"" | Out-Null;
127-
if ($LASTEXITCODE -ne 0) {
128-
Throw "An error occured while restoring NBench.Runner from NuGet."
129-
}
130-
}
131-
132117
###########################################################################
133118
# Docfx
134119
###########################################################################

0 commit comments

Comments
 (0)