From 6ea2875834bbcd9a9a5f41b42fd0ba93f82da962 Mon Sep 17 00:00:00 2001 From: Joao Moreno Date: Thu, 18 May 2017 15:47:21 +0200 Subject: [PATCH] tfs: fix global variable access --- build/tfs/win32/1_build.ps1 | 8 ++++---- build/tfs/win32/2_package.ps1 | 2 +- build/tfs/win32/3_upload.ps1 | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/build/tfs/win32/1_build.ps1 b/build/tfs/win32/1_build.ps1 index 2eb99701748..85143023e72 100644 --- a/build/tfs/win32/1_build.ps1 +++ b/build/tfs/win32/1_build.ps1 @@ -13,7 +13,7 @@ $env:HOME=$env:USERPROFILE "machine monacotools.visualstudio.com password ${vsoPAT}" | Out-File "$env:USERPROFILE\_netrc" -Encoding ASCII step "Install dependencies" { - exec { & npm install "--arch=$arch" } + exec { & npm install "--arch=$global:arch" } } $env:VSCODE_MIXIN_PASSWORD = $mixinPassword @@ -22,15 +22,15 @@ step "Mix in repository from vscode-distro" { } step "Get Electron" { - exec { & npm run gulp -- "electron-$arch" } + exec { & npm run gulp -- "electron-$global:arch" } } step "Install distro dependencies" { - exec { & node build\tfs\common\installDistro.js "--arch=$arch" } + exec { & node build\tfs\common\installDistro.js "--arch=$global:arch" } } step "Build minified" { - exec { & npm run gulp -- --max_old_space_size=4096 "vscode-win32-$arch-min" } + exec { & npm run gulp -- --max_old_space_size=4096 "vscode-win32-$global:arch-min" } } step "Run unit tests" { diff --git a/build/tfs/win32/2_package.ps1 b/build/tfs/win32/2_package.ps1 index beaa816e0e4..63d7c9cc412 100644 --- a/build/tfs/win32/2_package.ps1 +++ b/build/tfs/win32/2_package.ps1 @@ -5,7 +5,7 @@ Param( . .\build\tfs\win32\lib.ps1 step "Create archive and setup package" { - exec { & npm run gulp -- --max_old_space_size=4096 "vscode-win32-$arch-archive" "vscode-win32-$arch-setup" } + exec { & npm run gulp -- --max_old_space_size=4096 "vscode-win32-$global:arch-archive" "vscode-win32-$global:arch-setup" } } done \ No newline at end of file diff --git a/build/tfs/win32/3_upload.ps1 b/build/tfs/win32/3_upload.ps1 index 7eb99c4a541..12086545597 100644 --- a/build/tfs/win32/3_upload.ps1 +++ b/build/tfs/win32/3_upload.ps1 @@ -22,11 +22,11 @@ $env:MOONCAKE_STORAGE_ACCESS_KEY = $mooncakeStorageKey $env:AZURE_DOCUMENTDB_MASTERKEY = $documentDbKey step "Publish archive" { - exec { & node build/tfs/common/publish.js $Quality win32-archive archive "VSCode-win32-$arch-$Version.zip" $Version true $Zip } + exec { & node build/tfs/common/publish.js $Quality win32-archive archive "VSCode-win32-$global:arch-$Version.zip" $Version true $Zip } } step "Publish setup package" { - exec { & node build/tfs/common/publish.js $Quality win32 setup "VSCodeSetup-$arch-$Version.exe" $Version true $Exe } + exec { & node build/tfs/common/publish.js $Quality win32 setup "VSCodeSetup-$global:arch-$Version.exe" $Version true $Exe } } done \ No newline at end of file -- GitLab