Skip to content

Commit 9f66efe

Browse files
committed
[test] Test cleaning Android SDK and archives
1 parent bcf5ba6 commit 9f66efe

File tree

2 files changed

+17
-15
lines changed

2 files changed

+17
-15
lines changed

build-tools/Xamarin.Android.Tools.BootstrapTasks/Xamarin.Android.Tools.BootstrapTasks/CreateAndroidEmulator.cs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -92,11 +92,9 @@ void Run (string android)
9292
if (Log.HasLoggedErrors)
9393
return;
9494

95-
string fullSystemImagePath = Path.Combine (AndroidSdkHome, "system-images", $"android-{SdkVersion}", "default", AndroidAbi);
9695
File.AppendAllLines (configPath, new string[] {
9796
$"disk.dataPartition.size={diskSize}M",
98-
$"hw.ramSize={ramSize}",
99-
$"image.sysdir.1={fullSystemImagePath}"
97+
$"hw.ramSize={ramSize}"
10098
});
10199
}
102100

build-tools/automation/azure-pipelines.yaml

Lines changed: 16 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -235,35 +235,39 @@ stages:
235235

236236
- stage: test
237237
displayName: Test
238-
dependsOn: mac_build
238+
dependsOn: []
239239
jobs:
240240
- job: mac_apk_tests
241241
displayName: APK Instrumentation
242-
pool: $(XA.Build.Mac.Pool)
242+
pool: Hosted Mac Internal Mojave
243243
timeoutInMinutes: 240
244244
cancelTimeoutInMinutes: 5
245245
variables:
246246
ApkTestConfiguration: Release
247247
steps:
248-
- task: DownloadPipelineArtifact@1
249-
inputs:
250-
artifactName: $(InstallerArtifactName)
251-
itemPattern: "*.pkg"
252-
downloadPath: $(System.DefaultWorkingDirectory)
248+
# - task: DownloadPipelineArtifact@1
249+
# inputs:
250+
# artifactName: $(InstallerArtifactName)
251+
# itemPattern: "*.pkg"
252+
# downloadPath: $(System.DefaultWorkingDirectory)
253253

254-
- template: yaml-templates/run-installer.yaml
254+
# - template: yaml-templates/run-installer.yaml
255255

256256
- task: MSBuild@1
257257
displayName: build xaprepare
258258
inputs:
259259
solution: build-tools/xaprepare/xaprepare.sln
260-
configuration: $(XA.Build.Configuration)
260+
configuration: $(ApkTestConfiguration)
261261
msbuildArguments: /t:Restore,Build
262262

263263
- script: |
264-
mono build-tools/xaprepare/xaprepare/bin/$(XA.Build.Configuration)/xaprepare.exe --s=UpdateMono --auto-provision=yes --auto-provision-uses-sudo=yes --no-emoji --run-mode=CI
265-
mono build-tools/xaprepare/xaprepare/bin/$(XA.Build.Configuration)/xaprepare.exe --s=Required --auto-provision=yes --auto-provision-uses-sudo=yes --no-emoji --run-mode=CI
266-
mono build-tools/xaprepare/xaprepare/bin/$(XA.Build.Configuration)/xaprepare.exe --s=AndroidToolchain --no-emoji --run-mode=CI
264+
rm -rf $(HOME)/android-archives
265+
rm -rf $(HOME)/android-toolchain/sdk
266+
267+
- script: |
268+
mono build-tools/xaprepare/xaprepare/bin/$(ApkTestConfiguration)/xaprepare.exe --s=UpdateMono --auto-provision=yes --auto-provision-uses-sudo=yes --no-emoji --run-mode=CI
269+
mono build-tools/xaprepare/xaprepare/bin/$(ApkTestConfiguration)/xaprepare.exe --s=Required --auto-provision=yes --auto-provision-uses-sudo=yes --no-emoji --run-mode=CI
270+
mono build-tools/xaprepare/xaprepare/bin/$(ApkTestConfiguration)/xaprepare.exe --s=AndroidToolchain --no-emoji --run-mode=CI
267271
displayName: provision dependencies
268272
269273
- task: NuGetCommand@2

0 commit comments

Comments
 (0)