Update '.drone.yml'

.drone.yml

@@ -2,48 +2,47 @@ kind: pipeline
 name: default
 
 steps:
-- name: submodules
-  image: alpine/git
-  commands:
-  - git submodule update --init --recursive
+  - name: submodules
+    image: alpine/git
+    commands:
+      - git submodule update --init --recursive
 
-- name: extract keystore
-  image: alpine
-  commands:
-    - echo $ANDROID_RELEASE_KEYSTORE | base64 -d > android_release.keystore
-    - du -hs ./android_release.keystore
-  environment:
-    ANDROID_RELEASE_KEYSTORE:
-      from_secret: android-release-keystore
+  - name: build firmware
+    image: python:3.6
+    commands:
+      - cd firmware
+      - "pip install -U platformio"
+      - "platformio run --environment esp32"
+      - cp .pio/build/esp32/firmware.bin firmware-esp32.bin
 
-- name: build firmware
-  image: python:3.6
-  commands:
-    - cd firmware
-    - "pip install -U platformio"
-    - "platformio run --environment esp32"
-    - cp .pio/build/esp32/firmware.bin firmware-esp32.bin
+  - name: build app
+    image: itsblue.dev/plugins/qt-android:5.15.5-3
+    settings:
+      qmake_arguments: "CONFIG+=release"
+      androiddeployqt_arguments: "--android-platform android-31"
+      src_dir: app
+      android_keystore_data:
+        from_secret: android-release-keystore
+      android_keystore_alias: "bmca"
+      android_keystore_store_pass:
+        from_secret: android-release-keystore-password
 
-- name: build app
-  image: itsblue.dev/plugins/qt-android:5.15.5-3
-  settings:
-    qmake_arguments: "CONFIG+=release"
-    androiddeployqt_arguments: "--android-platform android-31"
-    src_dir: app
-    android_keystore_path: "android_release.keystore"
-    android_keystore_alias: "bmca"
-    android_keystore_store_pass:
-      from_secret: android-release-keystore-password
+  - name: move outputs in place
+    image: alpine
+    commands:
+      - mkdir dist
+      - mv ./firmware/firmware-esp32.bin dist
+      - mv ./outputs/apk/release/android-build-release-signed.apk dist
+      - mv ./outputs/bundle/release/android-build-release.aab dist
+    when:
+      event: tag
 
-- name: release
-  image: plugins/gitea-release
-  settings:
-    base_url: https://itsblue.dev
-    api_key:
-      from_secret: gitea-token
-    files:
-    - ./firmware/firmware-esp32.bin
-    - ./outputs/apk/release/android-build-release-signed.apk
-    - ./outputs/bundle/release/android-build-release.aab
-  when:
-   event: tag
+  - name: release
+    image: plugins/gitea-release
+    settings:
+      base_url: https://itsblue.dev
+      api_key:
+        from_secret: gitea-token
+      files: dist/*
+    when:
+      event: tag