From 7c60e1092bab4ba66770696ebb78c9f2c97bb083 Mon Sep 17 00:00:00 2001 From: Jerome Laban Date: Wed, 13 Nov 2024 22:02:06 -0500 Subject: [PATCH] chore: Adjust android tests replace --- build/scripts/android-uitest-run.sh | 1 + build/stage-uitests-android.yml | 2 +- build/templates/canary-updater.yml | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/build/scripts/android-uitest-run.sh b/build/scripts/android-uitest-run.sh index 947aa4c7e..23f31a5db 100644 --- a/build/scripts/android-uitest-run.sh +++ b/build/scripts/android-uitest-run.sh @@ -12,6 +12,7 @@ export UNO_UITEST_ANDROID_PROJECT=$BUILD_SOURCESDIRECTORY/Uno.Gallery export UNO_UITEST_BINARY=$BUILD_SOURCESDIRECTORY/Uno.Gallery.UITests/bin/Release/net47/Uno.Gallery.UITests.dll export UNO_EMULATOR_INSTALLED=$BUILD_SOURCESDIRECTORY/build/.emulator_started export UITEST_TEST_TIMEOUT=60m +export UNO_UITEST_ANDROIDAPK_PATH=$UNO_UITEST_ANDROIDAPK_BASEPATH/com.nventive.uno.ui.demo-Signed.apk # Override Android SDK tooling export ANDROID_HOME=$BUILD_SOURCESDIRECTORY/build/android-sdk diff --git a/build/stage-uitests-android.yml b/build/stage-uitests-android.yml index c807855c8..ace863065 100644 --- a/build/stage-uitests-android.yml +++ b/build/stage-uitests-android.yml @@ -66,7 +66,7 @@ - template: templates/canary-updater.yml - bash: | - export UNO_UITEST_ANDROIDAPK_PATH=$(Pipeline.Workspace)/Android_UITest/com.nventive.uno.ui.demo-Signed.apk + export UNO_UITEST_ANDROIDAPK_BASEPATH=$(Pipeline.Workspace)/Android_UITest chmod +x $(build.sourcesdirectory)/build/scripts/android-uitest-run.sh $(build.sourcesdirectory)/build/scripts/android-uitest-run.sh displayName: Run Android Tests diff --git a/build/templates/canary-updater.yml b/build/templates/canary-updater.yml index ce9b7b99a..6178a5d51 100644 --- a/build/templates/canary-updater.yml +++ b/build/templates/canary-updater.yml @@ -56,7 +56,7 @@ steps: condition: startsWith(variables['Build.SourceBranch'], 'refs/heads/canaries') - pwsh: | - gci -r -include AndroidManifest.xml,android-uitest-run.sh | + gci -r -include AndroidManifest.xml,android-uitest-*.sh | foreach-object { $a = $_.fullname; ( get-content $a ) | foreach-object { $_ -replace "com.nventive.uno.ui.demo","com.nventive.uno.ui.demo.canary" } |