From 09cdb2bb1c0ebb73869414e04fb5d0a054fec36c Mon Sep 17 00:00:00 2001
From: Jo Shields <joshield@microsoft.com>
Date: Wed, 7 Feb 2024 09:52:33 -0500
Subject: [PATCH] Create per-arch artifact upload folder

---
 eng/pipelines/templates/jobs/vmr-build.yml         | 1 +
 eng/pipelines/templates/steps/vmr-pull-updates.yml | 9 +++++++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/eng/pipelines/templates/jobs/vmr-build.yml b/eng/pipelines/templates/jobs/vmr-build.yml
index 5575d778b..98f21b224 100644
--- a/eng/pipelines/templates/jobs/vmr-build.yml
+++ b/eng/pipelines/templates/jobs/vmr-build.yml
@@ -134,6 +134,7 @@ jobs:
       parameters:
         vmrPath: ${{ parameters.vmrPath }}
         vmrBranch: ${{ parameters.vmrBranch }}
+        architecture: ${{ parameters.architecture }}
         targetRef: $(Build.SourceVersion) # Synchronize the current installer commit
 
   - ${{ if parameters.buildFromArchive }}:
diff --git a/eng/pipelines/templates/steps/vmr-pull-updates.yml b/eng/pipelines/templates/steps/vmr-pull-updates.yml
index 86a6cbd64..01569afa6 100644
--- a/eng/pipelines/templates/steps/vmr-pull-updates.yml
+++ b/eng/pipelines/templates/steps/vmr-pull-updates.yml
@@ -17,6 +17,11 @@ parameters:
   type: string
   default: $(Agent.BuildDirectory)/vmr
 
+- name: architecture
+  displayName: Architecture used for build artifacts
+  type: string
+  default: 'x64'
+
 steps:
 - checkout: self
   displayName: Clone dotnet/installer
@@ -37,12 +42,12 @@ steps:
   workingDirectory: ${{ parameters.vmrPath }}
 
 - script: |
-    mkdir -p ${{ parameters.vmrPath }}/artifacts/x64/Release
+    mkdir -p ${{ parameters.vmrPath }}/artifacts/${{ parameters.architecture }}/Release
   displayName: Create artifacts folder (Unix)
   condition: ne(variables['Agent.OS'], 'Windows_NT')
 
 - powershell: |
-    New-Item -ItemType Directory -Path ${{ parameters.vmrPath }}/artifacts/x64/Release
+    New-Item -ItemType Directory -Path ${{ parameters.vmrPath }}/artifacts/${{ parameters.architecture }}/Release
   displayName: Create artifacts folder (Windows)
   condition: eq(variables['Agent.OS'], 'Windows_NT')