more build fixes

build/azure-pipelines/product-build.yml

@@ -30,6 +30,8 @@ stages:
         pool:
           vmImage: "Ubuntu-18.04"
         container: vscode-x64
+        variables:
+          VSCODE_ARCH: x64
         steps:
           - template: product-compile.yml
 

build/azure-pipelines/product-compile.yml

@@ -4,8 +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
-    displayName: Prepare cache flag
+    displayName: Prepare compilation cache flag
 
   - task: 1ESLighthouseEng.PipelineArtifactCaching.RestoreCacheV1.RestoreCache@1
     inputs:
@@ -60,6 +59,10 @@ steps:
     timeoutInMinutes: 5
     condition: and(succeeded(), ne(variables['CacheExists-Compilation'], 'true'), eq(variables['ENABLE_TERRAPIN'], 'true'))
 
+  - script: |
+      echo -n $(VSCODE_ARCH) > .build/arch
+    displayName: Prepare yarn cache flags
+
   - task: 1ESLighthouseEng.PipelineArtifactCaching.RestoreCacheV1.RestoreCache@1
     inputs:
       keyfile: ".build/arch, .build/terrapin, build/.cachesalt, .yarnrc, remote/.yarnrc, **/yarn.lock, !**/node_modules/**/yarn.lock, !**/.*/**/yarn.lock"