Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion build-tools/automation/azure-pipelines.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -341,6 +341,8 @@ stages:
jobs:
# Check - "Xamarin.Android (Smoke Tests APKs Legacy - macOS)"
- job: mac_apk_tests_legacy
# Disabled on .NET 6 release branches
condition: false
displayName: APKs Legacy - macOS
pool:
vmImage: $(HostedMacImage)
Expand Down Expand Up @@ -820,7 +822,8 @@ stages:
- stage: msbuild_legacy
displayName: Legacy Tests
dependsOn: mac_build
condition: and(succeeded(), or(eq(variables['RunAllTests'], true), contains(dependencies.mac_build.outputs['mac_build_create_installers.TestConditions.TestAreas'], 'MSBuild')))
# Disabled on .NET 6 release branches
condition: false
jobs:
# Xamarin.Android (Test MSBuild Legacy - macOS)
- template: yaml-templates\run-msbuild-mac-tests.yaml
Expand Down Expand Up @@ -1315,6 +1318,8 @@ stages:
jobs:
# Check - "Xamarin.Android (BCL Emulator Tests macOS)"
- job: mac_bcl_tests
# Disabled on .NET 6 release branches
condition: false
displayName: macOS
pool:
vmImage: $(HostedMacImage)
Expand Down
9 changes: 6 additions & 3 deletions build-tools/automation/yaml-templates/run-installer.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,8 @@ steps:
artifactName: $(InstallerArtifactName)
downloadPath: $(System.DefaultWorkingDirectory)
patterns: Xamarin.Android*.vsix
condition: and(succeeded(), eq(variables['agent.os'], 'Windows_NT'))
# Disabled on .NET 6 release branches
condition: false

- powershell: |
$itemPattern = "*.vsix"
Expand All @@ -29,14 +30,16 @@ steps:
}
Write-Host "##vso[task.setvariable variable=XA.Provisionator.Args]$installer"
displayName: find installer and set provisionator variable
condition: and(succeeded(), ne(variables['agent.os'], 'Linux'))
# Disabled Windows on .NET 6 release branches
condition: and(succeeded(), eq(variables['agent.os'], 'Darwin'))

- task: provisionator@2
inputs:
provisionator_uri: $(provisionator-uri)
github_token: $(GitHub.Token)
provisioning_script: $(XA.Provisionator.Args)
provisioning_extra_args: ${{ parameters.provisionExtraArgs }}
condition: and(succeeded(), ne(variables['agent.os'], 'Linux'))
# Disabled Windows on .NET 6 release branches
condition: and(succeeded(), eq(variables['agent.os'], 'Darwin'))
env:
PROVISIONATOR_CHANNEL: ${{ parameters.provisionatorChannel }}
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@ parameters:
jobs:
- job: ${{ parameters.job_name }}
displayName: MSBuild With Emulator - macOS-${{ parameters.node_id }} - ${{ parameters.job_suffix }}
# Disabled on .NET 6 release branches
condition: ne('${{ parameters.job_suffix }}', 'Legacy')
pool:
vmImage: $(HostedMacImage)
timeoutInMinutes: 90
Expand Down