Further tweaks

.drone.jsonnet

@@ -18,14 +18,6 @@ local clone_submodules = {
   commands: ['git fetch --tags', 'git submodule update --init --recursive --depth=2 --jobs=4']
 };
 
-// Install dependencies
-local install_dependencies = {
-  name: 'Install Dependencies',
-  image: docker_base + 'android',
-  commands: ['apt-get install -y ninja-build']
-};
-
-
 // cmake options for static deps mirror
 local ci_dep_mirror(want_mirror) = (if want_mirror then ' -DLOCAL_MIRROR=https://oxen.rocks/deps ' else '');
 
@@ -40,13 +32,13 @@ local ci_dep_mirror(want_mirror) = (if want_mirror then ' -DLOCAL_MIRROR=https:/
     steps: [
       version_info,
       clone_submodules,
-      install_dependencies,
       {
         name: 'Run Unit Tests',
         image: docker_base + 'android',
         pull: 'always',
         environment: { ANDROID_HOME: '/usr/lib/android-sdk' },
         commands: [
+          'apt-get install -y ninja-build',
           './gradlew testPlayDebugUnitTestCoverageReport'
         ],
       }
@@ -80,25 +72,17 @@ local ci_dep_mirror(want_mirror) = (if want_mirror then ' -DLOCAL_MIRROR=https:/
     steps: [
       version_info,
       clone_submodules,
-      install_dependencies,
       {
-        name: 'Build',
+        name: 'Build and upload',
         image: docker_base + 'android',
         pull: 'always',
-        environment: { ANDROID_HOME: '/usr/lib/android-sdk' },
+        environment: { SSH_KEY: { from_secret: 'SSH_KEY' }, ANDROID_HOME: '/usr/lib/android-sdk' },
         commands: [
-          './gradlew assemblePlayDebug'
+          'apt-get install -y ninja-build',
+          './gradlew assemblePlayDebug',
+          './scripts/drone-static-upload.sh'
         ],
-      },
-      {
-          name: 'Upload artifacts',
-          image: docker_base + 'android',
-          pull: 'always',
-          environment: { SSH_KEY: { from_secret: 'SSH_KEY' } },
-          commands: [
-            './scripts/drone-static-upload.sh'
-          ]
-        },
+      }
     ],
   }
 ]