Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Consolidate pipelines #811

Merged
merged 2 commits into from
Sep 12, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 25 additions & 9 deletions .vsts.ix-shared.yml → .azure-pipelines.ix.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,18 @@
parameters:
signStep: []

trigger:
branches:
include:
- master
- rel/*
paths:
include:
- Ix.NET/Source/*
- .editorconfig
- .azure-pipelines.ix.yml

queue: Hosted VS2017
variables:
BuildConfiguration: Release

steps:
- task: DotNetCoreCLI@2
inputs:
Expand All @@ -13,10 +25,6 @@ steps:
- script: nbgv cloud -p Ix.NET\Source
displayName: Set Version
condition: and(succeeded(), eq(variables['system.pullrequest.isfork'], false))

- task: DotNetCoreInstaller@0
inputs:
version: '2.1.400'

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

- ${{ parameters.signStep }}
- task: PowerShell@2
displayName: Authenticode Sign Packages
inputs:
filePath: Ix.NET/Source/build/Sign-Package.ps1
env:
SignClientUser: $(SignClientUser)
SignClientSecret: $(SignClientSecret)
ArtifactDirectory: $(Build.ArtifactStagingDirectory)\artifacts
condition: and(succeeded(), not(eq(variables['build.reason'], 'PullRequest')), not(eq(variables['SignClientSecret'], '')), not(eq(variables['SignClientUser'], '')))

- task: PublishBuildArtifacts@1
inputs:
PathtoPublish: $(Build.ArtifactStagingDirectory)\artifacts
ArtifactName: artifacts
publishLocation: Container
condition: eq(variables['system.pullrequest.isfork'], false)
condition: and(succeeded(), eq(variables['system.pullrequest.isfork'], false))
34 changes: 26 additions & 8 deletions .vsts.rx-shared.yml → .azure-pipelines.rx.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,19 @@
parameters:
signStep: []
trigger:
branches:
include:
- master
- rel/*
paths:
include:
- Rx.NET/Source/*
- .editorconfig
- .azure-pipelines.rx.yml

queue: Hosted VS2017

variables:
BuildConfiguration: Release
BuildPlatform: Any CPU

steps:
- task: DotNetCoreCLI@2
Expand All @@ -13,10 +27,6 @@ steps:
- script: nbgv cloud -a -p Rx.NET\Source
displayName: Set Version
condition: and(succeeded(), eq(variables['system.pullrequest.isfork'], false))

- task: DotNetCoreInstaller@0
inputs:
version: '2.1.400'

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

- ${{ parameters.signStep }}
- task: PowerShell@2
displayName: Authenticode Sign Packages
inputs:
filePath: Rx.NET/Source/build/Sign-Package.ps1
env:
SignClientUser: $(SignClientUser)
SignClientSecret: $(SignClientSecret)
ArtifactDirectory: $(Build.ArtifactStagingDirectory)\artifacts
condition: and(succeeded(), not(eq(variables['build.reason'], 'PullRequest')), not(eq(variables['SignClientSecret'], '')), not(eq(variables['SignClientUser'], '')))

- task: PublishBuildArtifacts@1
inputs:
PathtoPublish: $(Build.ArtifactStagingDirectory)\artifacts
ArtifactName: artifacts
publishLocation: Container
condition: eq(variables['system.pullrequest.isfork'], false)
condition: and(succeeded(), eq(variables['system.pullrequest.isfork'], false))
29 changes: 0 additions & 29 deletions .vsts.ix-ci.yml

This file was deleted.

9 changes: 0 additions & 9 deletions .vsts.ix-pr.yml

This file was deleted.

31 changes: 0 additions & 31 deletions .vsts.rx-ci.yml

This file was deleted.

10 changes: 0 additions & 10 deletions .vsts.rx-pr.yml

This file was deleted.