chore: Adjust android tests replace

unoplatform · Nov 27, 2024 · 7c60e10 · 7c60e10
1 parent b4d0f16
commit 7c60e10
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git 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
@@ -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
@@ -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" } |