From 7effe1a58417214f313efef1d8bd3e37beb6b921 Mon Sep 17 00:00:00 2001 From: Dorian Zedler Date: Wed, 3 Aug 2022 13:25:55 +0200 Subject: [PATCH 01/15] Add '.drone.yml' --- .drone.yml | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 .drone.yml diff --git a/.drone.yml b/.drone.yml new file mode 100644 index 0000000..4c09cc5 --- /dev/null +++ b/.drone.yml @@ -0,0 +1,36 @@ +kind: pipeline +name: default + +steps: +- name: submodules + image: alpine/git + commands: + - git submodule update --init --recursive + +- 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-2 + settings: + qmake_arguments: "CONFIG+=release" + androiddeployqt_arguments: "--android-platform android-31" + src_dir: app + +- 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 \ No newline at end of file From f75e496a312048d423a744b4ce1c3d0a85433620 Mon Sep 17 00:00:00 2001 From: Dorian Zedler Date: Wed, 3 Aug 2022 13:51:57 +0200 Subject: [PATCH 02/15] Update '.drone.yml' --- .drone.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.drone.yml b/.drone.yml index 4c09cc5..5b7473b 100644 --- a/.drone.yml +++ b/.drone.yml @@ -15,6 +15,14 @@ steps: - "platformio run --environment esp32" - cp .pio/build/esp32/firmware.bin firmware-esp32.bin +- name: extract keystore + image: alpine + commands: + - echo ${ANDROID_RELEASE_KEYSTORE} | base64 --decode > android_release.keystore + environment: + ANDROID_RELEASE_KEYSTORE: + from_secret: android-release-keystore + - name: build app image: itsblue.dev/plugins/qt-android:5.15.5-2 settings: From fe2d427d019aef9398fc9e7bfe8982881f1998a5 Mon Sep 17 00:00:00 2001 From: Dorian Zedler Date: Wed, 3 Aug 2022 13:52:23 +0200 Subject: [PATCH 03/15] Update '.drone.yml' --- .drone.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/.drone.yml b/.drone.yml index 5b7473b..b24d106 100644 --- a/.drone.yml +++ b/.drone.yml @@ -7,14 +7,6 @@ steps: commands: - git submodule update --init --recursive -- 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: extract keystore image: alpine commands: @@ -23,6 +15,14 @@ steps: 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 app image: itsblue.dev/plugins/qt-android:5.15.5-2 settings: From cf44a2e2dd2e13f1ebbdb31355e1c270f935f3ed Mon Sep 17 00:00:00 2001 From: Dorian Zedler Date: Wed, 3 Aug 2022 13:52:50 +0200 Subject: [PATCH 04/15] Update '.drone.yml' --- .drone.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index b24d106..ac84710 100644 --- a/.drone.yml +++ b/.drone.yml @@ -10,7 +10,7 @@ steps: - name: extract keystore image: alpine commands: - - echo ${ANDROID_RELEASE_KEYSTORE} | base64 --decode > android_release.keystore + - echo ${ANDROID_RELEASE_KEYSTORE} | base64 -d > android_release.keystore environment: ANDROID_RELEASE_KEYSTORE: from_secret: android-release-keystore From 64214c711bc1445cee47e304d41293827928cbc5 Mon Sep 17 00:00:00 2001 From: Dorian Zedler Date: Wed, 3 Aug 2022 13:53:39 +0200 Subject: [PATCH 05/15] Update '.drone.yml' --- .drone.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index ac84710..a2c9dec 100644 --- a/.drone.yml +++ b/.drone.yml @@ -10,7 +10,7 @@ steps: - name: extract keystore image: alpine commands: - - echo ${ANDROID_RELEASE_KEYSTORE} | base64 -d > android_release.keystore + - echo $ANDROID_RELEASE_KEYSTORE | base64 -d > android_release.keystore environment: ANDROID_RELEASE_KEYSTORE: from_secret: android-release-keystore From 00fd5248937bc0d87a52908e226d62f87c366b7b Mon Sep 17 00:00:00 2001 From: Dorian Zedler Date: Wed, 3 Aug 2022 13:54:21 +0200 Subject: [PATCH 06/15] Update '.drone.yml' --- .drone.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.drone.yml b/.drone.yml index a2c9dec..c107783 100644 --- a/.drone.yml +++ b/.drone.yml @@ -11,6 +11,7 @@ steps: 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 From eb39242613cbf50c9e6dd49ea21ec5da8c7e7c35 Mon Sep 17 00:00:00 2001 From: Dorian Zedler Date: Thu, 4 Aug 2022 17:35:39 +0200 Subject: [PATCH 07/15] Update '.drone.yml' --- .drone.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.drone.yml b/.drone.yml index c107783..8152de7 100644 --- a/.drone.yml +++ b/.drone.yml @@ -30,6 +30,10 @@ steps: 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: release image: plugins/gitea-release From 5b61d356d24e444c62b18bb0c637c21dd99d5bea Mon Sep 17 00:00:00 2001 From: Dorian Zedler Date: Fri, 5 Aug 2022 08:18:24 +0200 Subject: [PATCH 08/15] Update '.drone.yml' --- .drone.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index 8152de7..ae9b06c 100644 --- a/.drone.yml +++ b/.drone.yml @@ -25,7 +25,7 @@ steps: - cp .pio/build/esp32/firmware.bin firmware-esp32.bin - name: build app - image: itsblue.dev/plugins/qt-android:5.15.5-2 + image: itsblue.dev/plugins/qt-android:5.15.5-3 settings: qmake_arguments: "CONFIG+=release" androiddeployqt_arguments: "--android-platform android-31" From 247827ede3dcb05d7247d2961862fbfc3e7f92a8 Mon Sep 17 00:00:00 2001 From: Dorian Zedler Date: Fri, 5 Aug 2022 08:58:12 +0200 Subject: [PATCH 09/15] Update '.drone.yml' --- .drone.yml | 81 +++++++++++++++++++++++++++--------------------------- 1 file changed, 40 insertions(+), 41 deletions(-) diff --git a/.drone.yml b/.drone.yml index ae9b06c..8ad295e 100644 --- a/.drone.yml +++ b/.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 \ No newline at end of file + - name: release + image: plugins/gitea-release + settings: + base_url: https://itsblue.dev + api_key: + from_secret: gitea-token + files: dist/* + when: + event: tag \ No newline at end of file From 13b71d4267bbe85d2c70e6c260d81b900429c3aa Mon Sep 17 00:00:00 2001 From: Dorian Zedler Date: Fri, 5 Aug 2022 09:13:31 +0200 Subject: [PATCH 10/15] Update '.drone.yml' --- .drone.yml | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/.drone.yml b/.drone.yml index 8ad295e..a185cd4 100644 --- a/.drone.yml +++ b/.drone.yml @@ -27,22 +27,12 @@ steps: 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: dist/* + files: [firmware/firmware-esp32.bin, outputs/apk/release/android-build-release-signed.apk, outputs/bundle/release/android-build-release.aab] when: event: tag \ No newline at end of file From fdb51f92d26d1e322a9a509cca179dfe0090efa9 Mon Sep 17 00:00:00 2001 From: Dorian Zedler Date: Fri, 5 Aug 2022 09:24:34 +0200 Subject: [PATCH 11/15] Update '.drone.yml' --- .drone.yml | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index a185cd4..8ad295e 100644 --- a/.drone.yml +++ b/.drone.yml @@ -27,12 +27,22 @@ steps: 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] + files: dist/* when: event: tag \ No newline at end of file From 7438bade7dd49094ffcbe282c1dad4cc35896bdd Mon Sep 17 00:00:00 2001 From: Dorian Zedler Date: Fri, 5 Aug 2022 09:36:55 +0200 Subject: [PATCH 12/15] Update '.drone.yml' --- .drone.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.drone.yml b/.drone.yml index 8ad295e..7d5de2c 100644 --- a/.drone.yml +++ b/.drone.yml @@ -30,12 +30,12 @@ steps: - name: move outputs in place image: alpine commands: + - ls outputs + - ls outputs/* - 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 From 52b9d81a9266a3df1c5f4802f64c6de21273abc1 Mon Sep 17 00:00:00 2001 From: Dorian Zedler Date: Fri, 5 Aug 2022 09:56:59 +0200 Subject: [PATCH 13/15] Update '.drone.yml' --- .drone.yml | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/.drone.yml b/.drone.yml index 7d5de2c..f8f445e 100644 --- a/.drone.yml +++ b/.drone.yml @@ -27,22 +27,15 @@ steps: android_keystore_store_pass: from_secret: android-release-keystore-password - - name: move outputs in place - image: alpine - commands: - - ls outputs - - ls outputs/* - - 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 - - name: release image: plugins/gitea-release settings: base_url: https://itsblue.dev api_key: from_secret: gitea-token - files: dist/* + files: + - firmware/firmware-esp32.bin dist + - app/outputs/apk/release/android-build-release-signed.apk dist + - app/outputs/bundle/release/android-build-release.aab dist when: event: tag \ No newline at end of file From 458dfa472cd5bb6ba60b807a2d7000cc9be4bcc7 Mon Sep 17 00:00:00 2001 From: Dorian Zedler Date: Fri, 5 Aug 2022 10:04:12 +0200 Subject: [PATCH 14/15] Update '.drone.yml' --- .drone.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.drone.yml b/.drone.yml index f8f445e..4d04a35 100644 --- a/.drone.yml +++ b/.drone.yml @@ -34,8 +34,8 @@ steps: api_key: from_secret: gitea-token files: - - firmware/firmware-esp32.bin dist - - app/outputs/apk/release/android-build-release-signed.apk dist - - app/outputs/bundle/release/android-build-release.aab dist + - firmware/firmware-esp32.bin + - app/outputs/apk/release/android-build-release-signed.apk + - app/outputs/bundle/release/android-build-release.aab when: event: tag \ No newline at end of file From 76a06db8417eed02bf2df18b28cf618c5de8d273 Mon Sep 17 00:00:00 2001 From: Dorian Zedler Date: Fri, 5 Aug 2022 10:14:32 +0200 Subject: [PATCH 15/15] Update '.drone.yml' --- .drone.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index 4d04a35..fbf6e95 100644 --- a/.drone.yml +++ b/.drone.yml @@ -19,7 +19,7 @@ steps: image: itsblue.dev/plugins/qt-android:5.15.5-3 settings: qmake_arguments: "CONFIG+=release" - androiddeployqt_arguments: "--android-platform android-31" + androiddeployqt_arguments: "--android-platform android-31 --aab" src_dir: app android_keystore_data: from_secret: android-release-keystore