fix misuse of VSCODE_ARCH in builds

build/azure-pipelines/darwin/product-build-darwin.yml

@@ -4,7 +4,7 @@ steps:
       echo -n $BUILD_SOURCEVERSION > .build/commit
       echo -n $VSCODE_QUALITY > .build/quality
       echo -n $ENABLE_TERRAPIN > .build/terrapin
-      echo -n $VSCODE_ARCH > .build/arch
+      echo -n $(VSCODE_ARCH) > .build/arch
     displayName: Prepare cache flag
 
   - task: 1ESLighthouseEng.PipelineArtifactCaching.RestoreCacheV1.RestoreCache@1

build/azure-pipelines/linux/product-build-linux.yml

@@ -4,7 +4,7 @@ steps:
       echo -n $BUILD_SOURCEVERSION > .build/commit
       echo -n $VSCODE_QUALITY > .build/quality
       echo -n $ENABLE_TERRAPIN > .build/terrapin
-      echo -n $VSCODE_ARCH > .build/arch
+      echo -n $(VSCODE_ARCH) > .build/arch
     displayName: Prepare cache flag
 
   - task: 1ESLighthouseEng.PipelineArtifactCaching.RestoreCacheV1.RestoreCache@1
@@ -68,7 +68,7 @@ steps:
 
   - script: |
       set -e
-      export npm_config_arch=$(VSCODE_ARCH)
+      export npm_config_arch=$(NPM_ARCH)
       export CHILD_CONCURRENCY="1"
       for i in {1..3}; do # try 3 times, for Terrapin
         yarn --frozen-lockfile && break

build/azure-pipelines/product-compile.yml

@@ -4,7 +4,7 @@ steps:
       echo -n $BUILD_SOURCEVERSION > .build/commit
       echo -n $VSCODE_QUALITY > .build/quality
       echo -n $ENABLE_TERRAPIN > .build/terrapin
-      echo -n $VSCODE_ARCH > .build/arch
+      echo -n $(VSCODE_ARCH) > .build/arch
     displayName: Prepare cache flag
 
   - task: 1ESLighthouseEng.PipelineArtifactCaching.RestoreCacheV1.RestoreCache@1

build/azure-pipelines/win32/product-build-win32.yml

@@ -4,7 +4,7 @@ steps:
       "$env:BUILD_SOURCEVERSION" | Out-File -Encoding ascii -NoNewLine .build\commit
       "$env:VSCODE_QUALITY" | Out-File -Encoding ascii -NoNewLine .build\quality
       "$env:ENABLE_TERRAPIN" | Out-File -Encoding ascii -NoNewLine .build\terrapin
-      "$env:VSCODE_ARCH" | Out-File -Encoding ascii -NoNewLine .build\arch
+      "$(VSCODE_ARCH)" | Out-File -Encoding ascii -NoNewLine .build\arch
     displayName: Prepare cache flag
 
   - task: 1ESLighthouseEng.PipelineArtifactCaching.RestoreCacheV1.RestoreCache@1
@@ -103,9 +103,9 @@ steps:
       . build/azure-pipelines/win32/exec.ps1
       $ErrorActionPreference = "Stop"
       $env:VSCODE_MIXIN_PASSWORD="$(github-distro-mixin-password)"
-      exec { yarn gulp "vscode-win32-$env:VSCODE_ARCH-min-ci" }
-      exec { yarn gulp "vscode-win32-$env:VSCODE_ARCH-code-helper" }
-      exec { yarn gulp "vscode-win32-$env:VSCODE_ARCH-inno-updater" }
+      exec { yarn gulp "vscode-win32-$(VSCODE_ARCH)-min-ci" }
+      exec { yarn gulp "vscode-win32-$(VSCODE_ARCH)-code-helper" }
+      exec { yarn gulp "vscode-win32-$(VSCODE_ARCH)-inno-updater" }
       echo "##vso[task.setvariable variable=CodeSigningFolderPath]$(agent.builddirectory)/VSCode-win32-$(VSCODE_ARCH)"
     displayName: Build
 
@@ -113,8 +113,8 @@ steps:
       . build/azure-pipelines/win32/exec.ps1
       $ErrorActionPreference = "Stop"
       $env:VSCODE_MIXIN_PASSWORD="$(github-distro-mixin-password)"
-      exec { yarn gulp "vscode-reh-win32-$env:VSCODE_ARCH-min-ci" }
-      exec { yarn gulp "vscode-reh-web-win32-$env:VSCODE_ARCH-min-ci" }
+      exec { yarn gulp "vscode-reh-win32-$(VSCODE_ARCH)-min-ci" }
+      exec { yarn gulp "vscode-reh-web-win32-$(VSCODE_ARCH)-min-ci" }
       echo "##vso[task.setvariable variable=CodeSigningFolderPath]$(CodeSigningFolderPath),$(agent.builddirectory)/vscode-reh-win32-$(VSCODE_ARCH)"
     displayName: Build Server
     condition: and(succeeded(), ne(variables['VSCODE_ARCH'], 'arm64'))