Browse Source

Drone: optimize assemble while waiting for server/emulator

- Don't assemble Gplay separately from gplayDebug. We already have some GH actions to verify that all flavors assemble.
- Assemble the AndroidTest task, so that there's less work to do when installGplayDebug is called

Signed-off-by: Álvaro Brey Vilas <alvaro.brey@nextcloud.com>
Álvaro Brey Vilas 2 years ago
parent
commit
323fdda409
2 changed files with 2 additions and 5 deletions
  1. 1 3
      .drone.yml
  2. 1 2
      scripts/runCombinedTest.sh

+ 1 - 3
.drone.yml

@@ -20,9 +20,7 @@ steps:
       - scripts/checkIfRunDrone.sh $GIT_USERNAME $GIT_TOKEN $DRONE_PULL_REQUEST || exit 0
       - emulator -avd android -no-snapshot -gpu swiftshader_indirect -no-window -no-audio -skin 500x833 &
       - sed -i s'#<bool name="is_beta">false</bool>#<bool name="is_beta">true</bool>#'g app/src/main/res/values/setup.xml
-      - sed -i s"#server#server#" gradle.properties
-      - ./gradlew assembleGplay
-      - ./gradlew assembleGplayDebug
+      - ./gradlew assembleGplayDebugAndroidTest
       - scripts/wait_for_emulator.sh
       - ./gradlew installGplayDebugAndroidTest
       - scripts/wait_for_server.sh "server"

+ 1 - 2
scripts/runCombinedTest.sh

@@ -9,8 +9,7 @@ DRONE_BUILD_NUMBER=$6
 
 scripts/deleteOldComments.sh "master" "IT" $DRONE_PULL_REQUEST $GIT_TOKEN
 
-./gradlew assembleGplay
-./gradlew assembleGplayDebug
+./gradlew assembleGplayDebugAndroidTest
 
 scripts/wait_for_emulator.sh