summary refs log tree commit diff
diff options
context:
space:
mode:
authorOren Novotny <oren@novotny.org>2018-09-13 17:15:17 -0400
committerOren Novotny <oren@novotny.org>2018-09-13 17:15:17 -0400
commitb964d44ff2d76d9d25e05fa0a60fba306c2ad7aa (patch)
treed534ee218b9e9e8256f162738b7843e3fd416ff3
parentEnsure simple ver (diff)
downloadBouncyCastle.NET-ed25519-b964d44ff2d76d9d25e05fa0a60fba306c2ad7aa.tar.xz
consolidate files
Diffstat (limited to '')
-rw-r--r--.azure-pipelines.yml (renamed from .vsts-shared.yml)24
-rw-r--r--.vsts-ci.yml19
-rw-r--r--.vsts-pr.yml6
3 files changed, 19 insertions, 30 deletions
diff --git a/.vsts-shared.yml b/.azure-pipelines.yml
index aff5d5927..7cb771f6f 100644
--- a/.vsts-shared.yml
+++ b/.azure-pipelines.yml
@@ -1,6 +1,12 @@
-parameters: 
-  signSteps: []
-  
+trigger:
+- netstandard
+- rel/*
+
+queue: Hosted VS2017
+
+variables: 
+  BuildConfiguration: Release
+
 steps:
 - task: DotNetCoreCLI@2  
   inputs:
@@ -30,7 +36,15 @@ steps:
     arguments: -c $(BuildConfiguration) --collect:"Code Coverage" -s $(System.DefaultWorkingDirectory)\CodeCoverage.runsettings /p:DebugType=portable
   displayName: Run Tests
   
-- ${{ parameters.signSteps }}
+- task: PowerShell@2
+  displayName: Authenticode Sign artifacts
+  inputs:
+    filePath: scripts/Sign-Package.ps1
+  env:
+    SignClientUser: $(SignClientUser)
+    SignClientSecret: $(SignClientSecret)
+    ArtifactDirectory: $(Build.ArtifactStagingDirectory)\Packages
+  condition: and(succeeded(), not(eq(variables['build.reason'], 'PullRequest')), not(eq(variables['SignClientSecret'], '')), not(eq(variables['SignClientUser'], '')))
 
 - task: PublishBuildArtifacts@1
   displayName: Publish Package Artifacts
@@ -38,4 +52,4 @@ steps:
     pathToPublish: $(Build.ArtifactStagingDirectory)\Packages
     artifactType: container
     artifactName: Packages
-  condition: eq(variables['system.pullrequest.isfork'], false)
+  condition: and(succeeded(), eq(variables['system.pullrequest.isfork'], false))
diff --git a/.vsts-ci.yml b/.vsts-ci.yml
deleted file mode 100644
index 63f102462..000000000
--- a/.vsts-ci.yml
+++ /dev/null
@@ -1,19 +0,0 @@
-trigger:
-- netstandard
-- rel/*
-
-queue: Hosted VS2017
-variables: 
-  BuildConfiguration: Release
-steps:
-- template: .vsts-shared.yml
-  parameters:
-    signSteps:
-    - task: PowerShell@2
-      displayName: Authenticode Sign artifacts
-      inputs:
-        filePath: scripts/Sign-Package.ps1
-      env:
-        SignClientUser: $(SignClientUser)
-        SignClientSecret: $(SignClientSecret)
-        ArtifactDirectory: $(Build.ArtifactStagingDirectory)\Packages
diff --git a/.vsts-pr.yml b/.vsts-pr.yml
deleted file mode 100644
index 6209bba42..000000000
--- a/.vsts-pr.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-trigger: none
-queue: Hosted VS2017
-variables: 
-  BuildConfiguration: Release
-steps:
-- template: .vsts-shared.yml
\ No newline at end of file