From 778a9bafbbf49a9fb76e09e00a1678a7687ad555 Mon Sep 17 00:00:00 2001 From: Joao Moreno Date: Tue, 10 Jul 2018 13:12:42 +0200 Subject: [PATCH] more windows build error catching related to #52805 --- build/tfs/win32/continuous-build-win32.yml | 9 ++++++ build/tfs/win32/product-build-win32.yml | 37 ++++++++++++---------- 2 files changed, 30 insertions(+), 16 deletions(-) diff --git a/build/tfs/win32/continuous-build-win32.yml b/build/tfs/win32/continuous-build-win32.yml index ffb4668eff2..6490c637b78 100644 --- a/build/tfs/win32/continuous-build-win32.yml +++ b/build/tfs/win32/continuous-build-win32.yml @@ -7,38 +7,47 @@ steps: versionSpec: "1.3.2" - powershell: | . build/tfs/win32/exec.ps1 + $ErrorActionPreference = "Stop" exec { yarn } displayName: Install Dependencies - powershell: | . build/tfs/win32/exec.ps1 + $ErrorActionPreference = "Stop" exec { yarn gulp electron } displayName: Download Electron - powershell: | . build/tfs/win32/exec.ps1 + $ErrorActionPreference = "Stop" exec { yarn gulp hygiene } displayName: Run Hygiene Checks - powershell: | . build/tfs/win32/exec.ps1 + $ErrorActionPreference = "Stop" exec { yarn check-monaco-editor-compilation } displayName: Run Monaco Editor Checks - powershell: | . build/tfs/win32/exec.ps1 + $ErrorActionPreference = "Stop" exec { yarn compile } displayName: Compile Sources - powershell: | . build/tfs/win32/exec.ps1 + $ErrorActionPreference = "Stop" exec { yarn download-builtin-extensions } displayName: Download Built-in Extensions - powershell: | . build/tfs/win32/exec.ps1 + $ErrorActionPreference = "Stop" exec { .\scripts\test.bat --tfs "Unit Tests" } displayName: Run Unit Tests - powershell: | . build/tfs/win32/exec.ps1 + $ErrorActionPreference = "Stop" exec { .\scripts\test-integration.bat --tfs "Integration Tests" } displayName: Run Integration Tests - powershell: | . build/tfs/win32/exec.ps1 + $ErrorActionPreference = "Stop" exec { yarn smoketest --screenshots "$(Build.ArtifactStagingDirectory)\artifacts" --log "$(Build.ArtifactStagingDirectory)\artifacts\smoketest.log" } displayName: Run Smoke Tests continueOnError: true diff --git a/build/tfs/win32/product-build-win32.yml b/build/tfs/win32/product-build-win32.yml index bcf430ce7e7..20546a2f5fc 100644 --- a/build/tfs/win32/product-build-win32.yml +++ b/build/tfs/win32/product-build-win32.yml @@ -8,29 +8,32 @@ steps: versionSpec: "1.3.2" - powershell: | + . build/tfs/win32/exec.ps1 $ErrorActionPreference = "Stop" "machine monacotools.visualstudio.com password $(VSO_PAT)" | Out-File "$env:USERPROFILE\_netrc" -Encoding ASCII $env:npm_config_arch="$(VSCODE_ARCH)" $env:CHILD_CONCURRENCY="1" - yarn - npm run gulp -- hygiene - npm run monaco-compile-check $env:VSCODE_MIXIN_PASSWORD="$(VSCODE_MIXIN_PASSWORD)" - npm run gulp -- mixin - node build/tfs/common/installDistro.js - node build/lib/builtInExtensions.js + exec { yarn } + exec { npm run gulp -- hygiene } + exec { npm run monaco-compile-check } + exec { npm run gulp -- mixin } + exec { node build/tfs/common/installDistro.js } + exec { node build/lib/builtInExtensions.js } - powershell: | + . build/tfs/win32/exec.ps1 $ErrorActionPreference = "Stop" $env:VSCODE_MIXIN_PASSWORD="$(VSCODE_MIXIN_PASSWORD)" - npm run gulp -- "vscode-win32-$(VSCODE_ARCH)-min" - npm run gulp -- "vscode-win32-$(VSCODE_ARCH)-copy-inno-updater" + exec { npm run gulp -- "vscode-win32-$(VSCODE_ARCH)-min" } + exec { npm run gulp -- "vscode-win32-$(VSCODE_ARCH)-copy-inno-updater" } name: build - powershell: | + . build/tfs/win32/exec.ps1 $ErrorActionPreference = "Stop" - npm run gulp -- "electron-$(VSCODE_ARCH)" - .\scripts\test.bat --build --tfs "Unit Tests" + exec { npm run gulp -- "electron-$(VSCODE_ARCH)" } + exec { .\scripts\test.bat --build --tfs "Unit Tests" } # yarn smoketest -- --build "$(agent.builddirectory)\VSCode-win32-$(VSCODE_ARCH)" name: test @@ -128,13 +131,15 @@ steps: ESRP: 'ESRP CodeSign' - powershell: | + . build/tfs/win32/exec.ps1 $ErrorActionPreference = "Stop" - .\build\tfs\win32\import-esrp-auth-cert.ps1 -AuthCertificateBase64 $(ESRP_AUTH_CERTIFICATE) -AuthCertificateKey $(ESRP_AUTH_CERTIFICATE_KEY) + exec { .\build\tfs\win32\import-esrp-auth-cert.ps1 -AuthCertificateBase64 $(ESRP_AUTH_CERTIFICATE) -AuthCertificateKey $(ESRP_AUTH_CERTIFICATE_KEY) } displayName: Import ESRP Auth Certificate - powershell: | + . build/tfs/win32/exec.ps1 $ErrorActionPreference = "Stop" - npm run gulp -- "vscode-win32-$(VSCODE_ARCH)-archive" "vscode-win32-$(VSCODE_ARCH)-system-setup" "vscode-win32-$(VSCODE_ARCH)-user-setup" + exec { npm run gulp -- "vscode-win32-$(VSCODE_ARCH)-archive" "vscode-win32-$(VSCODE_ARCH)-system-setup" "vscode-win32-$(VSCODE_ARCH)-user-setup" } $Repo = "$(pwd)" $Root = "$Repo\.." @@ -153,10 +158,10 @@ steps: $assetPlatform = if ("$(VSCODE_ARCH)" -eq "ia32") { "win32" } else { "win32-x64" } - node build/tfs/common/publish.js $Quality "$global:assetPlatform-archive" archive "VSCode-win32-$(VSCODE_ARCH)-$Version.zip" $Version true $Zip - node build/tfs/common/publish.js $Quality "$global:assetPlatform" setup "VSCodeSetup-$(VSCODE_ARCH)-$Version.exe" $Version true $SystemExe - node build/tfs/common/publish.js $Quality "$global:assetPlatform-user" setup "VSCodeUserSetup-$(VSCODE_ARCH)-$Version.exe" $Version true $UserExe + exec { node build/tfs/common/publish.js $Quality "$global:assetPlatform-archive" archive "VSCode-win32-$(VSCODE_ARCH)-$Version.zip" $Version true $Zip } + exec { node build/tfs/common/publish.js $Quality "$global:assetPlatform" setup "VSCodeSetup-$(VSCODE_ARCH)-$Version.exe" $Version true $SystemExe } + exec { node build/tfs/common/publish.js $Quality "$global:assetPlatform-user" setup "VSCodeUserSetup-$(VSCODE_ARCH)-$Version.exe" $Version true $UserExe } # publish hockeyapp symbols $hockeyAppId = if ("$(VSCODE_ARCH)" -eq "ia32") { "$(VSCODE_HOCKEYAPP_ID_WIN32)" } else { "$(VSCODE_HOCKEYAPP_ID_WIN64)" } - node build/tfs/common/symbols.js "$(VSCODE_MIXIN_PASSWORD)" "$(VSCODE_HOCKEYAPP_TOKEN)" "$(VSCODE_ARCH)" $hockeyAppId + exec { node build/tfs/common/symbols.js "$(VSCODE_MIXIN_PASSWORD)" "$(VSCODE_HOCKEYAPP_TOKEN)" "$(VSCODE_ARCH)" $hockeyAppId }