From 30faa524d356691d42a796765f875f2dca46bfda Mon Sep 17 00:00:00 2001 From: Oren Novotny Date: Wed, 12 Sep 2018 12:51:50 -0400 Subject: [PATCH 1/2] Consolidate pipelines --- ...s.ix-shared.yml => .azure-pipelines.ix.yml | 35 ++++++++++++++----- ...s.rx-shared.yml => .azure-pipelines.rx.yml | 34 +++++++++++++----- .vsts.ix-ci.yml | 29 --------------- .vsts.ix-pr.yml | 9 ----- .vsts.rx-ci.yml | 31 ---------------- .vsts.rx-pr.yml | 10 ------ 6 files changed, 52 insertions(+), 96 deletions(-) rename .vsts.ix-shared.yml => .azure-pipelines.ix.yml (60%) rename .vsts.rx-shared.yml => .azure-pipelines.rx.yml (74%) delete mode 100644 .vsts.ix-ci.yml delete mode 100644 .vsts.ix-pr.yml delete mode 100644 .vsts.rx-ci.yml delete mode 100644 .vsts.rx-pr.yml diff --git a/.vsts.ix-shared.yml b/.azure-pipelines.ix.yml similarity index 60% rename from .vsts.ix-shared.yml rename to .azure-pipelines.ix.yml index d6c18f4bca..8651c53acc 100644 --- a/.vsts.ix-shared.yml +++ b/.azure-pipelines.ix.yml @@ -1,6 +1,19 @@ -parameters: - signStep: [] - +trigger: + branches: + include: + - master + - rel/* + paths: + include: + - Ix.NET/Source/* + - .editorconfig + - .vsts.ix-ci.yml + - NuGet.Config + +queue: Hosted VS2017 +variables: + BuildConfiguration: Release + steps: - task: DotNetCoreCLI@2 inputs: @@ -13,10 +26,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: @@ -34,11 +43,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) \ No newline at end of file + condition: and(succeeded(), eq(variables['system.pullrequest.isfork'], false)) \ No newline at end of file diff --git a/.vsts.rx-shared.yml b/.azure-pipelines.rx.yml similarity index 74% rename from .vsts.rx-shared.yml rename to .azure-pipelines.rx.yml index 37f2f7b8e6..ab1a5279a4 100644 --- a/.vsts.rx-shared.yml +++ b/.azure-pipelines.rx.yml @@ -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 @@ -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 @@ -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) \ No newline at end of file + condition: and(succeeded(), eq(variables['system.pullrequest.isfork'], false)) \ No newline at end of file diff --git a/.vsts.ix-ci.yml b/.vsts.ix-ci.yml deleted file mode 100644 index f49413c8e6..0000000000 --- a/.vsts.ix-ci.yml +++ /dev/null @@ -1,29 +0,0 @@ -trigger: - branches: - include: - - master - - rel/* - paths: - include: - - Ix.NET/Source/* - - .editorconfig - - .vsts.ix-ci.yml - - NuGet.Config - -queue: Hosted VS2017 -variables: - BuildConfiguration: Release - DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true - -steps: -- template: .vsts.ix-shared.yml - 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 \ No newline at end of file diff --git a/.vsts.ix-pr.yml b/.vsts.ix-pr.yml deleted file mode 100644 index 2458d78de9..0000000000 --- a/.vsts.ix-pr.yml +++ /dev/null @@ -1,9 +0,0 @@ -trigger: none - -queue: Hosted VS2017 -variables: - BuildConfiguration: Release - DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true - -steps: -- template: .vsts.ix-shared.yml diff --git a/.vsts.rx-ci.yml b/.vsts.rx-ci.yml deleted file mode 100644 index 0ddc7f7cea..0000000000 --- a/.vsts.rx-ci.yml +++ /dev/null @@ -1,31 +0,0 @@ -trigger: - branches: - include: - - master - - rel/* - paths: - include: - - Rx.NET/Source/* - - .editorconfig - - .vsts.rx-ci.yml - - .vsts.rx-shared.yml - -queue: Hosted VS2017 - -variables: - BuildConfiguration: Release - BuildPlatform: Any CPU - DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true - -steps: -- template: .vsts.rx-shared.yml - 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 \ No newline at end of file diff --git a/.vsts.rx-pr.yml b/.vsts.rx-pr.yml deleted file mode 100644 index 7fa1773568..0000000000 --- a/.vsts.rx-pr.yml +++ /dev/null @@ -1,10 +0,0 @@ -trigger: none -queue: Hosted VS2017 - -variables: - BuildConfiguration: Release - BuildPlatform: Any CPU - DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true - -steps: -- template: .vsts.rx-shared.yml \ No newline at end of file From 94c57b4772efd894e64777d4ca1c2964b458fa11 Mon Sep 17 00:00:00 2001 From: Oren Novotny Date: Wed, 12 Sep 2018 12:56:07 -0400 Subject: [PATCH 2/2] fix paths --- .azure-pipelines.ix.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.azure-pipelines.ix.yml b/.azure-pipelines.ix.yml index 8651c53acc..41b1990d10 100644 --- a/.azure-pipelines.ix.yml +++ b/.azure-pipelines.ix.yml @@ -7,8 +7,7 @@ trigger: include: - Ix.NET/Source/* - .editorconfig - - .vsts.ix-ci.yml - - NuGet.Config + - .azure-pipelines.ix.yml queue: Hosted VS2017 variables: