Initial attempt at a Mac build

This commit is contained in:
Jo Shields 2023-12-08 11:51:37 -05:00
parent 5037ea286a
commit 749afddd02
2 changed files with 54 additions and 2 deletions

View file

@ -210,7 +210,14 @@ jobs:
echo "##vso[task.setvariable variable=additionalBuildArgs]--with-sdk /vmr/.dotnet"
fi
docker run --rm -v "$(sourcesPath):/vmr" -w /vmr ${{ parameters.container }} ./prep.sh $customPrepArgs
# Only use Docker stuff on Linux
if [[ "`uname -s`" == "Linux" ]]; then
dockerPrefix='docker run --rm -v "$(sourcesPath):/vmr" -w /vmr ${{ parameters.container }}'
else
dockerPrefix=''
fi
$dockerPrefix ./prep.sh $customPrepArgs
displayName: Prep the Build
- script: |
@ -252,7 +259,14 @@ jobs:
extraBuildProperties="$extraBuildProperties /p:OverrideTargetRid=${{ parameters.targetRid }}"
fi
docker run --rm -v "$(sourcesPath):/vmr" -w /vmr $customRunArgs ${{ parameters.container }} ./build.sh --clean-while-building $(additionalBuildArgs) $customBuildArgs $extraBuildProperties
# Only use Docker stuff on Linux
if [[ "`uname -s`" == "Linux" ]]; then
dockerPrefix='docker run --rm -v "$(sourcesPath):/vmr" -w /vmr ${{ parameters.container }}'
else
dockerPrefix=''
fi
${dockerPrefix} ./build.sh --clean-while-building $(additionalBuildArgs) $customBuildArgs $extraBuildProperties
displayName: Build
# Don't run tests if overriding RID, we don't support that for now

View file

@ -34,6 +34,10 @@ parameters:
name: NetCore-Public-XL
demands: ImageOverride -equals Build.Ubuntu.1804.Amd64.Open
# Mac
poolMac:
vmImage: 'macos-12'
stages:
- stage: VMR_PoC_Build
displayName: VMR PoC-Build
@ -105,3 +109,37 @@ stages:
withPreviousSDK: false # 🚫
crossRootFs: '/crossrootfs/arm64' # 📝
targetRid: 'linux-arm64' # 📝
- template: ../jobs/vmr-build.yml
parameters:
# Changing the build name requires updating the referenced name in the source-build-sdk-diff-tests.yml pipeline
buildName: OSXCrossX64_Online_MsftSdk
isBuiltFromVmr: ${{ parameters.isBuiltFromVmr }}
vmrBranch: ${{ variables.VmrBranch }}
architecture: x64
pool:
vmImage: ${{ parameters.poolMac }}
buildFromArchive: false # 🚫
enablePoison: false # 🚫
excludeOmniSharpTests: true # ✅
runOnline: true # ✅
useMonoRuntime: true # ✅
withPreviousSDK: false # 🚫
targetRid: 'osx-x64' # 📝
- template: ../jobs/vmr-build.yml
parameters:
# Changing the build name requires updating the referenced name in the source-build-sdk-diff-tests.yml pipeline
buildName: OSXCrossArm64_Online_MsftSdk
isBuiltFromVmr: ${{ parameters.isBuiltFromVmr }}
vmrBranch: ${{ variables.VmrBranch }}
architecture: x64
pool:
vmImage: ${{ parameters.poolMac }}
buildFromArchive: false # 🚫
enablePoison: false # 🚫
excludeOmniSharpTests: true # ✅
runOnline: true # ✅
useMonoRuntime: true # ✅
withPreviousSDK: false # 🚫
targetRid: 'osx-arm64' # 📝