Add Android x64 to build, let's see what happens

This commit is contained in:
Jo Shields 2024-02-07 10:38:35 -05:00
parent efb2c9e1cb
commit 33400c9394
2 changed files with 15 additions and 0 deletions

View file

@ -360,6 +360,19 @@ stages:
targetOS: osx
targetArchitecture: x64
- template: ../jobs/vmr-build.yml
parameters:
buildName: Android_Shortstack
isBuiltFromVmr: ${{ parameters.isBuiltFromVmr }}
vmrBranch: ${{ variables.VmrBranch }}
architecture: x64
pool:
name: ${{ variables.defaultPoolName }}
demands: ${{ variables.defaultPoolDemandsLinux }}
container: ${{ variables.androidCrossContainer }}
targetOS: android
targetArchitecture: x64
# Cross builds are currently failing
# - template: ../jobs/vmr-build.yml

View file

@ -26,6 +26,8 @@ variables:
value: mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner-2.0-cross-amd64
- name: marinerArm64CrossContainer
value: mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner-2.0-cross-arm64
- name: androidCrossContainer
value: mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner-2.0-cross-android-amd64
- ${{ if eq(variables['System.TeamProject'], 'public') }}:
- name: defaultPoolName