Skip to content

Commit 0eb7026

Browse files
authored
[ci] Fix xaprepare usage for nightly tests (#6381)
Context: 05ca38c Some of the nightly pipelines tests are failing because they need the recent "run `xaprepare` on .NET6" changes (05ca38c), otherwise `xaprepare.exe` can't be found: Cannot open assembly '/Users/runner/work/1/s/build-tools/xaprepare/xaprepare/bin/Release/xaprepare.exe': No such file or directory. A search of the repo shows these should be the final remaining instances still using `mono xaprepare`.
1 parent 4855a04 commit 0eb7026

File tree

3 files changed

+12
-8
lines changed

3 files changed

+12
-8
lines changed

build-tools/automation/azure-pipelines.yaml

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -146,10 +146,12 @@ stages:
146146
solution: $(System.DefaultWorkingDirectory)/xamarin-android/build-tools/Xamarin.Android.Tools.BootstrapTasks/Xamarin.Android.Tools.BootstrapTasks.csproj
147147
artifactName: Build Results - macOS
148148

149-
- script: mono $(System.DefaultWorkingDirectory)/xamarin-android/build-tools/xaprepare/xaprepare/bin/$(XA.Build.Configuration)/xaprepare.exe --s=DetermineApplicableTests --no-emoji --run-mode=CI
150-
displayName: determine which test stages to run
151-
name: TestConditions
152-
condition: and(succeeded(), eq(variables['Build.DefinitionName'], 'Xamarin.Android-PR'))
149+
- template: yaml-templates/run-xaprepare.yaml
150+
parameters:
151+
arguments: --s=DetermineApplicableTests
152+
xaSourcePath: $(System.DefaultWorkingDirectory)/xamarin-android
153+
displayName: determine which test stages to run
154+
condition: and(succeeded(), eq(variables['Build.DefinitionName'], 'Xamarin.Android-PR'))
153155

154156
# This stage ensures Windows specific build steps continue to work, and runs unit tests.
155157
# Check - "Xamarin.Android (Windows Build and Test)"

build-tools/automation/yaml-templates/run-systemapp-tests.yaml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,9 @@ jobs:
1212
steps:
1313
- template: setup-test-environment.yaml
1414

15-
- script: mono $(System.DefaultWorkingDirectory)/build-tools/xaprepare/xaprepare/bin/$(XA.Build.Configuration)/xaprepare.exe --s=EmulatorTestDependencies --no-emoji --run-mode=CI
16-
displayName: install emulator
15+
- template: run-xaprepare.yaml
16+
parameters:
17+
arguments: --s=EmulatorTestDependencies
1718

1819
- task: DownloadPipelineArtifact@2
1920
inputs:

build-tools/automation/yaml-templates/run-timezoneinfo-tests.yaml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,9 @@ jobs:
1515
steps:
1616
- template: setup-test-environment.yaml
1717

18-
- script: mono $(System.DefaultWorkingDirectory)/build-tools/xaprepare/xaprepare/bin/$(XA.Build.Configuration)/xaprepare.exe --s=EmulatorTestDependencies --no-emoji --run-mode=CI
19-
displayName: install emulator
18+
- template: run-xaprepare.yaml
19+
parameters:
20+
arguments: --s=EmulatorTestDependencies
2021

2122
- task: DownloadPipelineArtifact@2
2223
inputs:

0 commit comments

Comments
 (0)