[VMR] Turn on CI for all currently functional cross builds (#18521)

eng/pipelines/templates/jobs/vmr-build.yml

@@ -138,6 +138,7 @@ jobs:
           vmrPath: $(vmrPath)
           vmrBranch: ${{ parameters.vmrBranch }}
           targetRef: $(Build.SourceVersion) # Synchronize the current installer commit
+          architecture: ${{ parameters.architecture }}
 
   - ${{ if parameters.buildFromArchive }}:
     - script: |

eng/pipelines/templates/stages/vmr-build.yml

@@ -360,25 +360,25 @@ stages:
             targetOS: osx
             targetArchitecture: x64
 
-    # Cross builds are currently failing
+        - template: ../jobs/vmr-build.yml
+          parameters:
+            buildName: Mariner_x64_Cross
+            isBuiltFromVmr: ${{ parameters.isBuiltFromVmr }}
+            vmrBranch: ${{ variables.VmrBranch }}
+            architecture: x64
+            pool:
+              name: ${{ variables.defaultPoolName }}
+              demands: ${{ variables.defaultPoolDemandsLinux }}
+            container: ${{ variables.marinerX64CrossContainer }}
+            crossRootFs: '/crossrootfs/x64'
+            targetOS: linux
+            targetArchitecture: x64
+
+      # Mariner x64->non-x64 builds are currently broken, see https://github.com/dotnet/source-build/issues/3698
 
       # - template: ../jobs/vmr-build.yml
       #   parameters:
-      #     buildName: MarinerCross
-      #     isBuiltFromVmr: ${{ parameters.isBuiltFromVmr }}
-      #     vmrBranch: ${{ variables.VmrBranch }}
-      #     architecture: x64
-      #     pool:
-      #       name: ${{ variables.defaultPoolName }}
-      #       demands: ${{ variables.defaultPoolDemandsLinux }}
-      #     container: ${{ variables.marinerX64CrossContainer }}
-      #     crossRootFs: '/crossrootfs/x64'
-      #     targetOS: linux
-      #     targetArchitecture: x64
-
-      # - template: ../jobs/vmr-build.yml
-      #   parameters:
-      #     buildName: MarinerCross
+      #     buildName: Mariner_x64_Cross
       #     isBuiltFromVmr: ${{ parameters.isBuiltFromVmr }}
       #     vmrBranch: ${{ variables.VmrBranch }}
       #     architecture: arm64
@@ -390,14 +390,14 @@ stages:
       #     targetOS: linux
       #     targetArchitecture: arm64
 
-      # - template: ../jobs/vmr-build.yml
-      #   parameters:
-      #     buildName: OSXCross
-      #     isBuiltFromVmr: ${{ parameters.isBuiltFromVmr }}
-      #     vmrBranch: ${{ variables.VmrBranch }}
-      #     architecture: arm64
-      #     pool:
-      #       vmImage: ${{ variables.defaultPoolNameMac }}
-      #     container: ''
-      #     targetOS: osx
-      #     targetArchitecture: arm64
+        - template: ../jobs/vmr-build.yml
+          parameters:
+            buildName: OSX_x64_Cross
+            isBuiltFromVmr: ${{ parameters.isBuiltFromVmr }}
+            vmrBranch: ${{ variables.VmrBranch }}
+            architecture: arm64
+            pool:
+              vmImage: ${{ variables.defaultPoolNameMac }}
+            container: ''
+            targetOS: osx
+            targetArchitecture: arm64

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')