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
1 change: 1 addition & 0 deletions build-tools/automation/azure-pipelines.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,7 @@ extends:

- template: /build-tools/automation/yaml-templates/stage-xamarin-android-tools-tests.yaml@self
parameters:
use1ESTemplate: true
# The internal Xamarin.Android pipeline uses 1ES Pipeline Templates, which
# require Windows jobs to run on a 1ES-hosted pool. macOS is fine on the
# hosted Azure Pipelines pool as long as `os: macOS` is set (which is now
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,9 @@ parameters:
- name: condition
type: string
default: succeeded()
- name: use1ESTemplate
type: boolean
default: false
- name: windowsPool
type: object
# NOTE: This default is a Microsoft-hosted Azure Pipelines pool, which is NOT
Expand Down Expand Up @@ -69,6 +72,15 @@ stages:
timeoutInMinutes: 30
workspace:
clean: all
${{ if eq(parameters.use1ESTemplate, true) }}:
templateContext:
outputs:
- output: pipelineArtifact
displayName: Upload build logs
condition: always()
targetPath: $(Build.ArtifactStagingDirectory)
artifactName: android-tools-logs-windows
sbomEnabled: false
steps:
- checkout: self
clean: true
Expand All @@ -91,12 +103,13 @@ stages:
command: test
projects: $(XatSourceDirectory)/bin/TestDebug/**/*-Tests.dll

- task: PublishBuildArtifacts@1
displayName: Upload build logs
condition: always()
inputs:
pathToPublish: $(Build.ArtifactStagingDirectory)
artifactName: android-tools-logs-windows
- ${{ if eq(parameters.use1ESTemplate, false) }}:
- task: PublishBuildArtifacts@1
displayName: Upload build logs
condition: always()
inputs:
pathToPublish: $(Build.ArtifactStagingDirectory)
artifactName: android-tools-logs-windows

# Check - "Xamarin.Android (Android Tools Tests Mac - .NET)"
- job: xamarin_android_tools_mac
Expand All @@ -105,6 +118,15 @@ stages:
timeoutInMinutes: 30
workspace:
clean: all
${{ if eq(parameters.use1ESTemplate, true) }}:
templateContext:
outputs:
- output: pipelineArtifact
displayName: Upload build logs
condition: always()
targetPath: $(Build.ArtifactStagingDirectory)
artifactName: android-tools-logs-mac
sbomEnabled: false
steps:
- checkout: self
clean: true
Expand All @@ -127,9 +149,10 @@ stages:
command: test
projects: $(XatSourceDirectory)/bin/TestDebug/**/*-Tests.dll

- task: PublishBuildArtifacts@1
displayName: Upload build logs
condition: always()
inputs:
pathToPublish: $(Build.ArtifactStagingDirectory)
artifactName: android-tools-logs-mac
- ${{ if eq(parameters.use1ESTemplate, false) }}:
- task: PublishBuildArtifacts@1
displayName: Upload build logs
condition: always()
inputs:
pathToPublish: $(Build.ArtifactStagingDirectory)
artifactName: android-tools-logs-mac