Skip to content

Commit 30faa52

Browse files
author
Oren Novotny
committed
Consolidate pipelines
1 parent 4ed23b8 commit 30faa52

File tree

6 files changed

+52
-96
lines changed

6 files changed

+52
-96
lines changed

.vsts.ix-shared.yml renamed to .azure-pipelines.ix.yml

Lines changed: 26 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,19 @@
1-
parameters:
2-
signStep: []
3-
1+
trigger:
2+
branches:
3+
include:
4+
- master
5+
- rel/*
6+
paths:
7+
include:
8+
- Ix.NET/Source/*
9+
- .editorconfig
10+
- .vsts.ix-ci.yml
11+
- NuGet.Config
12+
13+
queue: Hosted VS2017
14+
variables:
15+
BuildConfiguration: Release
16+
417
steps:
518
- task: DotNetCoreCLI@2
619
inputs:
@@ -13,10 +26,6 @@ steps:
1326
- script: nbgv cloud -p Ix.NET\Source
1427
displayName: Set Version
1528
condition: and(succeeded(), eq(variables['system.pullrequest.isfork'], false))
16-
17-
- task: DotNetCoreInstaller@0
18-
inputs:
19-
version: '2.1.400'
2029

2130
- task: DotNetCoreCLI@2
2231
inputs:
@@ -34,11 +43,19 @@ steps:
3443
arguments: -c $(BuildConfiguration) --collect:"Code Coverage" -s $(System.DefaultWorkingDirectory)/Ix.NET/Source/CodeCoverage.runsettings /p:DebugType=Full
3544
displayName: Run Tests
3645

37-
- ${{ parameters.signStep }}
46+
- task: PowerShell@2
47+
displayName: Authenticode Sign Packages
48+
inputs:
49+
filePath: Ix.NET/Source/build/Sign-Package.ps1
50+
env:
51+
SignClientUser: $(SignClientUser)
52+
SignClientSecret: $(SignClientSecret)
53+
ArtifactDirectory: $(Build.ArtifactStagingDirectory)\artifacts
54+
condition: and(succeeded(), not(eq(variables['build.reason'], 'PullRequest')), not(eq(variables['SignClientSecret'], '')), not(eq(variables['SignClientUser'], '')))
3855

3956
- task: PublishBuildArtifacts@1
4057
inputs:
4158
PathtoPublish: $(Build.ArtifactStagingDirectory)\artifacts
4259
ArtifactName: artifacts
4360
publishLocation: Container
44-
condition: eq(variables['system.pullrequest.isfork'], false)
61+
condition: and(succeeded(), eq(variables['system.pullrequest.isfork'], false))

.vsts.rx-shared.yml renamed to .azure-pipelines.rx.yml

Lines changed: 26 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,19 @@
1-
parameters:
2-
signStep: []
1+
trigger:
2+
branches:
3+
include:
4+
- master
5+
- rel/*
6+
paths:
7+
include:
8+
- Rx.NET/Source/*
9+
- .editorconfig
10+
- .azure-pipelines.rx.yml
11+
12+
queue: Hosted VS2017
13+
14+
variables:
15+
BuildConfiguration: Release
16+
BuildPlatform: Any CPU
317

418
steps:
519
- task: DotNetCoreCLI@2
@@ -13,10 +27,6 @@ steps:
1327
- script: nbgv cloud -a -p Rx.NET\Source
1428
displayName: Set Version
1529
condition: and(succeeded(), eq(variables['system.pullrequest.isfork'], false))
16-
17-
- task: DotNetCoreInstaller@0
18-
inputs:
19-
version: '2.1.400'
2030

2131
- task: MSBuild@1
2232
displayName: Build System.Reactive.sln
@@ -57,11 +67,19 @@ steps:
5767
arguments: -c $(BuildConfiguration) --no-build --no-restore
5868
displayName: Run Api Approvals Tests
5969

60-
- ${{ parameters.signStep }}
70+
- task: PowerShell@2
71+
displayName: Authenticode Sign Packages
72+
inputs:
73+
filePath: Rx.NET/Source/build/Sign-Package.ps1
74+
env:
75+
SignClientUser: $(SignClientUser)
76+
SignClientSecret: $(SignClientSecret)
77+
ArtifactDirectory: $(Build.ArtifactStagingDirectory)\artifacts
78+
condition: and(succeeded(), not(eq(variables['build.reason'], 'PullRequest')), not(eq(variables['SignClientSecret'], '')), not(eq(variables['SignClientUser'], '')))
6179

6280
- task: PublishBuildArtifacts@1
6381
inputs:
6482
PathtoPublish: $(Build.ArtifactStagingDirectory)\artifacts
6583
ArtifactName: artifacts
6684
publishLocation: Container
67-
condition: eq(variables['system.pullrequest.isfork'], false)
85+
condition: and(succeeded(), eq(variables['system.pullrequest.isfork'], false))

.vsts.ix-ci.yml

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

.vsts.ix-pr.yml

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

.vsts.rx-ci.yml

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

.vsts.rx-pr.yml

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

0 commit comments

Comments
 (0)