From d881b203fa4465c60c4c011fe7640006bd460749 Mon Sep 17 00:00:00 2001 From: Dorian Zedler Date: Fri, 29 Jul 2022 08:48:09 +0200 Subject: [PATCH 01/15] Add '.drone.yml' --- .drone.yml | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 .drone.yml diff --git a/.drone.yml b/.drone.yml new file mode 100644 index 0000000..14d9aa7 --- /dev/null +++ b/.drone.yml @@ -0,0 +1,14 @@ +kind: pipeline +name: build and publish site +steps: +- name: build apk + plugin: itsblue.dev/plugins/qt-android + settings: + qmake_attributes: "CONFIG+=release" + qndroiddeployqt_attributes: "--aab" + +- name: publish package + image: ubuntu:20.04 + commands: + - ls -l ./* + \ No newline at end of file From 1cd7ad6649960a9aa23b4a0bc88f3d6470319757 Mon Sep 17 00:00:00 2001 From: Dorian Zedler Date: Fri, 29 Jul 2022 08:49:02 +0200 Subject: [PATCH 02/15] Update '.drone.yml' --- .drone.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index 14d9aa7..26d299e 100644 --- a/.drone.yml +++ b/.drone.yml @@ -2,7 +2,7 @@ kind: pipeline name: build and publish site steps: - name: build apk - plugin: itsblue.dev/plugins/qt-android + image: itsblue.dev/plugins/qt-android settings: qmake_attributes: "CONFIG+=release" qndroiddeployqt_attributes: "--aab" From d33748a06d3bbba01d8571997f7cfc7cc018a78e Mon Sep 17 00:00:00 2001 From: Dorian Zedler Date: Fri, 29 Jul 2022 09:06:39 +0200 Subject: [PATCH 03/15] Update '.drone.yml' --- .drone.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index 26d299e..d56ad35 100644 --- a/.drone.yml +++ b/.drone.yml @@ -5,7 +5,7 @@ steps: image: itsblue.dev/plugins/qt-android settings: qmake_attributes: "CONFIG+=release" - qndroiddeployqt_attributes: "--aab" + androiddeployqt_attributes: "--aab" - name: publish package image: ubuntu:20.04 From 5cfad624a3f2a6c242d4a0654ff518cb38e68387 Mon Sep 17 00:00:00 2001 From: Dorian Zedler Date: Fri, 29 Jul 2022 14:09:49 +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 d56ad35..399e046 100644 --- a/.drone.yml +++ b/.drone.yml @@ -2,7 +2,7 @@ kind: pipeline name: build and publish site steps: - name: build apk - image: itsblue.dev/plugins/qt-android + image: itsblue.dev/plugins/qt-android:5.15.5-1 settings: qmake_attributes: "CONFIG+=release" androiddeployqt_attributes: "--aab" From 3492e6c511947f040a1dba3635bcfd4f56730ef4 Mon Sep 17 00:00:00 2001 From: Dorian Zedler Date: Fri, 29 Jul 2022 14:19:01 +0200 Subject: [PATCH 05/15] Update '.drone.yml' --- .drone.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.drone.yml b/.drone.yml index 399e046..4831344 100644 --- a/.drone.yml +++ b/.drone.yml @@ -1,6 +1,11 @@ kind: pipeline name: build and publish site steps: +- name: submodules + image: alpine/git + commands: + - git submodule update --init --recursive + - name: build apk image: itsblue.dev/plugins/qt-android:5.15.5-1 settings: From c92362f07a81389b9d25bde3c5ff668d1c064132 Mon Sep 17 00:00:00 2001 From: Dorian Zedler Date: Fri, 29 Jul 2022 14:26:45 +0200 Subject: [PATCH 06/15] Update '.drone.yml' --- .drone.yml | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/.drone.yml b/.drone.yml index 4831344..04e86f1 100644 --- a/.drone.yml +++ b/.drone.yml @@ -15,5 +15,11 @@ steps: - name: publish package image: ubuntu:20.04 commands: - - ls -l ./* - \ No newline at end of file + - curl --user ${GITEA_USER}:${GITEA_TOKEN} \ + --upload-file outputs/apk/debug/android-build-debug.apk \ + https://itsblue.dev/api/packages/bluerock/generic/app/${DRONE_COMMIT_SHA}/bluerock.apk + environment: + GITEA_USER: + from_secret: docker_username + GITEA_TOKEN: + from_secret: docker_password \ No newline at end of file From 3a735e2cf435414b5439dad583c31060d9575bf8 Mon Sep 17 00:00:00 2001 From: Dorian Zedler Date: Fri, 29 Jul 2022 14:29:01 +0200 Subject: [PATCH 07/15] Update '.drone.yml' --- .drone.yml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/.drone.yml b/.drone.yml index 04e86f1..048e9fc 100644 --- a/.drone.yml +++ b/.drone.yml @@ -13,11 +13,9 @@ steps: androiddeployqt_attributes: "--aab" - name: publish package - image: ubuntu:20.04 + image: alpine/curl commands: - - curl --user ${GITEA_USER}:${GITEA_TOKEN} \ - --upload-file outputs/apk/debug/android-build-debug.apk \ - https://itsblue.dev/api/packages/bluerock/generic/app/${DRONE_COMMIT_SHA}/bluerock.apk + - curl --user ${GITEA_USER}:${GITEA_TOKEN} --upload-file outputs/apk/debug/android-build-debug.apk https://itsblue.dev/api/packages/bluerock/generic/app/${DRONE_COMMIT_SHA}/bluerock.apk environment: GITEA_USER: from_secret: docker_username From 75d7212fd932cd3c51db689c9e49f958263206ff Mon Sep 17 00:00:00 2001 From: Dorian Zedler Date: Fri, 29 Jul 2022 14:29:52 +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 048e9fc..20ae796 100644 --- a/.drone.yml +++ b/.drone.yml @@ -15,7 +15,7 @@ steps: - name: publish package image: alpine/curl commands: - - curl --user ${GITEA_USER}:${GITEA_TOKEN} --upload-file outputs/apk/debug/android-build-debug.apk https://itsblue.dev/api/packages/bluerock/generic/app/${DRONE_COMMIT_SHA}/bluerock.apk + - curl --user ${GITEA_USER}:${GITEA_TOKEN} --upload-file outputs/apk/debug/android-build-debug.apk https://itsblue.dev/api/packages/bluerock/generic/app/${DRONE_COMMIT_SHA}/bluerock.apk environment: GITEA_USER: from_secret: docker_username From 6b91988ac549432a1a63cb7254b0d373e9b635f5 Mon Sep 17 00:00:00 2001 From: Dorian Zedler Date: Fri, 29 Jul 2022 14:30:09 +0200 Subject: [PATCH 09/15] Update '.drone.yml' --- .drone.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index 20ae796..fe2d4ba 100644 --- a/.drone.yml +++ b/.drone.yml @@ -15,7 +15,7 @@ steps: - name: publish package image: alpine/curl commands: - - curl --user ${GITEA_USER}:${GITEA_TOKEN} --upload-file outputs/apk/debug/android-build-debug.apk https://itsblue.dev/api/packages/bluerock/generic/app/${DRONE_COMMIT_SHA}/bluerock.apk + - "curl --user ${GITEA_USER}:${GITEA_TOKEN} --upload-file outputs/apk/debug/android-build-debug.apk https://itsblue.dev/api/packages/bluerock/generic/app/${DRONE_COMMIT_SHA}/bluerock.apk" environment: GITEA_USER: from_secret: docker_username From fb17ec52cd956616d40d8ac9281160aa014064ff Mon Sep 17 00:00:00 2001 From: Dorian Zedler Date: Fri, 29 Jul 2022 14:35:31 +0200 Subject: [PATCH 10/15] Update '.drone.yml' --- .drone.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.drone.yml b/.drone.yml index fe2d4ba..19a7cd7 100644 --- a/.drone.yml +++ b/.drone.yml @@ -18,6 +18,6 @@ steps: - "curl --user ${GITEA_USER}:${GITEA_TOKEN} --upload-file outputs/apk/debug/android-build-debug.apk https://itsblue.dev/api/packages/bluerock/generic/app/${DRONE_COMMIT_SHA}/bluerock.apk" environment: GITEA_USER: - from_secret: docker_username + from_secret: gitea-user GITEA_TOKEN: - from_secret: docker_password \ No newline at end of file + from_secret: gitea-token \ No newline at end of file From 21b88575fb763d5a6dd1981756f258df3979f5c0 Mon Sep 17 00:00:00 2001 From: Dorian Zedler Date: Fri, 29 Jul 2022 14:40:16 +0200 Subject: [PATCH 11/15] Update '.drone.yml' --- .drone.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index 19a7cd7..fdf7afd 100644 --- a/.drone.yml +++ b/.drone.yml @@ -15,7 +15,7 @@ steps: - name: publish package image: alpine/curl commands: - - "curl --user ${GITEA_USER}:${GITEA_TOKEN} --upload-file outputs/apk/debug/android-build-debug.apk https://itsblue.dev/api/packages/bluerock/generic/app/${DRONE_COMMIT_SHA}/bluerock.apk" + - "curl --user $GITEA_USER:$GITEA_TOKEN --upload-file outputs/apk/debug/android-build-debug.apk https://itsblue.dev/api/packages/bluerock/generic/app/${DRONE_COMMIT_SHA}/bluerock.apk" environment: GITEA_USER: from_secret: gitea-user From 55a5aac4e1750439056698a9f0b3e1dfbd596574 Mon Sep 17 00:00:00 2001 From: Dorian Zedler Date: Sat, 30 Jul 2022 13:52:34 +0200 Subject: [PATCH 12/15] Update '.drone.yml' --- .drone.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.drone.yml b/.drone.yml index fdf7afd..1e498ce 100644 --- a/.drone.yml +++ b/.drone.yml @@ -15,6 +15,7 @@ steps: - name: publish package image: alpine/curl commands: + - env - "curl --user $GITEA_USER:$GITEA_TOKEN --upload-file outputs/apk/debug/android-build-debug.apk https://itsblue.dev/api/packages/bluerock/generic/app/${DRONE_COMMIT_SHA}/bluerock.apk" environment: GITEA_USER: From 551c6ffb6deff4b9eb3362d12a95180e01a44475 Mon Sep 17 00:00:00 2001 From: Dorian Zedler Date: Sat, 30 Jul 2022 14:22:04 +0200 Subject: [PATCH 13/15] Update '.drone.yml' --- .drone.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index 1e498ce..a67c769 100644 --- a/.drone.yml +++ b/.drone.yml @@ -16,7 +16,7 @@ steps: image: alpine/curl commands: - env - - "curl --user $GITEA_USER:$GITEA_TOKEN --upload-file outputs/apk/debug/android-build-debug.apk https://itsblue.dev/api/packages/bluerock/generic/app/${DRONE_COMMIT_SHA}/bluerock.apk" + - "curl --fail --user $GITEA_USER:$GITEA_TOKEN --upload-file outputs/apk/debug/android-build-debug.apk https://itsblue.dev/api/packages/bluerock/generic/app/0-preview-${DRONE_COMMIT_SHA}/bluerock.apk" environment: GITEA_USER: from_secret: gitea-user From a026912929dd1c1fd8daf4ae187e164747f9c8cc Mon Sep 17 00:00:00 2001 From: Dorian Zedler Date: Sat, 30 Jul 2022 14:35:59 +0200 Subject: [PATCH 14/15] Update '.drone.yml' --- .drone.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.drone.yml b/.drone.yml index a67c769..e8e0417 100644 --- a/.drone.yml +++ b/.drone.yml @@ -9,8 +9,8 @@ steps: - name: build apk image: itsblue.dev/plugins/qt-android:5.15.5-1 settings: - qmake_attributes: "CONFIG+=release" - androiddeployqt_attributes: "--aab" + qmake_arguments: "CONFIG+=release" + androiddeployqt_arguments: "--aab" - name: publish package image: alpine/curl From 2f3f0488da9755d3e1378fd33d95aceec86a1058 Mon Sep 17 00:00:00 2001 From: Dorian Zedler Date: Mon, 1 Aug 2022 12:00:43 +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 e8e0417..89cc122 100644 --- a/.drone.yml +++ b/.drone.yml @@ -10,7 +10,7 @@ steps: image: itsblue.dev/plugins/qt-android:5.15.5-1 settings: qmake_arguments: "CONFIG+=release" - androiddeployqt_arguments: "--aab" + androiddeployqt_arguments: "--android-platform android-31" - name: publish package image: alpine/curl