diff options
| author | João Moreno <joao.moreno@microsoft.com> | 2022-04-26 10:50:20 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-04-26 10:50:20 +0300 |
| commit | 3f557f2d39e4a94a0c6ba133e3058298cab2c2a0 (patch) | |
| tree | 3b2b7e22a7e9365146838bc05f7b8971fa174958 /build/azure-pipelines | |
| parent | d006f6d38b3337a17f3cd1fed96c4c308113cdc9 (diff) | |
Remove unnecessary build step (#148081)
* remove unnecessary build step
* ok
Diffstat (limited to 'build/azure-pipelines')
| -rw-r--r-- | build/azure-pipelines/common/sign.js | 2 | ||||
| -rw-r--r-- | build/azure-pipelines/common/sign.ts | 2 | ||||
| -rw-r--r-- | build/azure-pipelines/darwin/product-build-darwin-sign.yml | 7 |
3 files changed, 2 insertions, 9 deletions
diff --git a/build/azure-pipelines/common/sign.js b/build/azure-pipelines/common/sign.js index 96382c1c329..2c2168cacc3 100644 --- a/build/azure-pipelines/common/sign.js +++ b/build/azure-pipelines/common/sign.js @@ -18,7 +18,7 @@ function getParams(type) { case 'darwin-sign': return '[{"keyCode":"CP-401337-Apple","operationSetCode":"MacAppDeveloperSign","parameters":[{"parameterName":"Hardening","parameterValue":"--options=runtime"}],"toolName":"sign","toolVersion":"1.0"}]'; case 'darwin-notarize': - return '[{"keyCode":"CP-401337-Apple","operationSetCode":"MacAppNotarize","parameters":[{"parameterName":"BundleId","parameterValue":"$(BundleIdentifier)"}],"toolName":"sign","toolVersion":"1.0"}]'; + return '[{"keyCode":"CP-401337-Apple","operationSetCode":"MacAppNotarize","parameters":[],"toolName":"sign","toolVersion":"1.0"}]'; default: throw new Error(`Sign type ${type} not found`); } diff --git a/build/azure-pipelines/common/sign.ts b/build/azure-pipelines/common/sign.ts index 27d625674ba..a50ca698dfd 100644 --- a/build/azure-pipelines/common/sign.ts +++ b/build/azure-pipelines/common/sign.ts @@ -17,7 +17,7 @@ function getParams(type: string): string { case 'darwin-sign': return '[{"keyCode":"CP-401337-Apple","operationSetCode":"MacAppDeveloperSign","parameters":[{"parameterName":"Hardening","parameterValue":"--options=runtime"}],"toolName":"sign","toolVersion":"1.0"}]'; case 'darwin-notarize': - return '[{"keyCode":"CP-401337-Apple","operationSetCode":"MacAppNotarize","parameters":[{"parameterName":"BundleId","parameterValue":"$(BundleIdentifier)"}],"toolName":"sign","toolVersion":"1.0"}]'; + return '[{"keyCode":"CP-401337-Apple","operationSetCode":"MacAppNotarize","parameters":[],"toolName":"sign","toolVersion":"1.0"}]'; default: throw new Error(`Sign type ${type} not found`); } diff --git a/build/azure-pipelines/darwin/product-build-darwin-sign.yml b/build/azure-pipelines/darwin/product-build-darwin-sign.yml index 8f6f0f42383..f82e7a8b98d 100644 --- a/build/azure-pipelines/darwin/product-build-darwin-sign.yml +++ b/build/azure-pipelines/darwin/product-build-darwin-sign.yml @@ -78,13 +78,6 @@ steps: displayName: Codesign - script: | - APP_ROOT=$(agent.builddirectory)/VSCode-darwin-$(VSCODE_ARCH) - APP_NAME="`ls $APP_ROOT | head -n 1`" - BUNDLE_IDENTIFIER=$(node -p "require(\"$APP_ROOT/$APP_NAME/Contents/Resources/app/product.json\").darwinBundleIdentifier") - echo "##vso[task.setvariable variable=BundleIdentifier]$BUNDLE_IDENTIFIER" - displayName: Export bundle identifier - - - script: | set -e node build/azure-pipelines/common/sign "$(esrpclient.toolpath)/$(esrpclient.toolname)" darwin-notarize $(ESRP-PKI) $(esrp-aad-username) $(esrp-aad-password) $(agent.builddirectory) VSCode-darwin-$(VSCODE_ARCH).zip displayName: Notarize |