From fc0c05c75551d363c8fdaf6ed43683bea6e920bd Mon Sep 17 00:00:00 2001 From: Anthony Dresser Date: Thu, 21 Nov 2019 23:34:18 -0800 Subject: [PATCH] Remove steps that delete code sign.md (#8397) * remove steps that delete code sign.md * update sign tool * fix config * wip * add continue on error for md delete * try this * copy exactly what was there * remove final del --- .../win32/sql-product-build-win32.yml | 36 +++++++++---------- 1 file changed, 17 insertions(+), 19 deletions(-) diff --git a/build/azure-pipelines/win32/sql-product-build-win32.yml b/build/azure-pipelines/win32/sql-product-build-win32.yml index 15ca23d384..a8d29727c5 100644 --- a/build/azure-pipelines/win32/sql-product-build-win32.yml +++ b/build/azure-pipelines/win32/sql-product-build-win32.yml @@ -173,18 +173,17 @@ steps: MaxRetryAttempts: 20 condition: and(succeeded(), eq(variables['signed'], true)) - - powershell: | - . build/azure-pipelines/win32/exec.ps1 - $ErrorActionPreference = "Stop" - exec { del $(Build.SourcesDirectory)\..\azuredatastudio-win32-x64\CodeSignSummary*.md } + - task: CmdLine@1 + displayName: 'Delete CodeSignSummary.md' + inputs: + filename: del + arguments: '$(Build.SourcesDirectory)\..\azuredatastudio-win32-x64\CodeSignSummary*.md' condition: and(succeeded(), eq(variables['signed'], true)) - displayName: Delete CodeSignSummary.md - powershell: | . build/azure-pipelines/win32/exec.ps1 $ErrorActionPreference = "Stop" exec { yarn gulp "vscode-win32-x64-user-setup" } - continueOnError: true displayName: User setup - task: SFP.build-tasks.custom-build-task-1.EsrpCodeSigning@1 @@ -241,19 +240,18 @@ steps: MaxRetryAttempts: 20 condition: and(succeeded(), eq(variables['signed'], true)) - - powershell: | - . build/azure-pipelines/win32/exec.ps1 - $ErrorActionPreference = "Stop" - exec { del $(Build.SourcesDirectory)\.build\win32-x64\user-setup\CodeSignSummary.md } - condition: and(succeeded(), eq(variables['signed'], true)) + - task: CmdLine@1 + displayName: 'Delete CodeSignSummary.md for user installer' + inputs: + filename: del + arguments: '$(Build.SourcesDirectory)\.build\win32-x64\user-setup\CodeSignSummary.md' continueOnError: true - displayName: Delete CodeSignSummary.md + condition: and(succeeded(), eq(variables['signed'], true)) - powershell: | . build/azure-pipelines/win32/exec.ps1 $ErrorActionPreference = "Stop" exec { yarn gulp "vscode-win32-x64-system-setup" } - continueOnError: true displayName: System setup - task: SFP.build-tasks.custom-build-task-1.EsrpCodeSigning@1 @@ -310,13 +308,13 @@ steps: MaxRetryAttempts: 20 condition: and(succeeded(), eq(variables['signed'], true)) - - powershell: | - . build/azure-pipelines/win32/exec.ps1 - $ErrorActionPreference = "Stop" - exec { del $(Build.SourcesDirectory)\.build\win32-x64\system-setup\CodeSignSummary.md } - condition: and(succeeded(), eq(variables['signed'], true)) + - task: CmdLine@1 + displayName: 'Delete CodeSignSummary.md for installer' + inputs: + filename: del + arguments: '$(Build.SourcesDirectory)\.build\win32-x64\system-setup\CodeSignSummary.md' continueOnError: true - displayName: Delete CodeSignSummary.md + condition: and(succeeded(), eq(variables['signed'], true)) - script: | if exist $(Build.SourcesDirectory)\..\azuredatastudio-windows rmdir /s /q $(Build.SourcesDirectory)\..\azuredatastudio-windows