From 1bd277e7b2cdfc1d43de53f31454dac283d6de80 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Burak=20Han=C3=A7erli?= <burak.hancerli@qt.io>
Date: Wed, 12 Feb 2025 14:49:06 +0000
Subject: [PATCH] cicd: cleanup ci scripts

---
 cicd/android/android_release.keystore | Bin 2804 -> 0 bytes
 cicd/stages/build.yml                 |   9 +++++----
 src/backend/settings.cpp              |   5 +++--
 3 files changed, 8 insertions(+), 6 deletions(-)
 delete mode 100644 cicd/android/android_release.keystore

diff --git a/cicd/android/android_release.keystore b/cicd/android/android_release.keystore
deleted file mode 100644
index b8d55ca7380da897a4df89fd9b6c524e2c4200f2..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2804
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

diff --git a/cicd/stages/build.yml b/cicd/stages/build.yml
index 659a333..74aaa52 100644
--- a/cicd/stages/build.yml
+++ b/cicd/stages/build.yml
@@ -44,10 +44,13 @@
   - cmake --build ${QDS_CI_JOB_BUILD_PATH} --target aab
 
 .copy-and-sign-apks: &copy-and-sign-apks
+  - QDS_CI_KEYSTORE_PATH=$(pwd)/android_release.keystore
+  - QDS_CI_APK_SIGNER_PATH=${DOCKER_ENV_ANDROID_SDK_ROOT}/build-tools/${QDS_CI_ANDROID_SDK_VERSION}/apksigner
+  - echo ${QDS_VAR_KEYSTORE} | base64 -d > ${QDS_CI_KEYSTORE_PATH}
   - cp -r ${QDS_CI_JOB_BUILD_PATH}/src/android-build/build/outputs/apk/release/* ${QDS_CI_JOB_ARTIFACTS_PATH_APP}
   - cp -r ${QDS_CI_JOB_BUILD_PATH}/tests/android-build/build/outputs/apk/release/* ${QDS_CI_JOB_ARTIFACTS_PATH_TEST}
-  - echo ${QDS_VAR_PASS} | ${DOCKER_ENV_ANDROID_SDK_ROOT}/build-tools/${QDS_CI_ANDROID_SDK_VERSION}/apksigner sign -verbose -ks ${CI_PROJECT_DIR}/cicd/android/android_release.keystore -out ${QDS_CI_JOB_ARTIFACTS_PATH_APP}/android-build-release.apk ${QDS_CI_JOB_ARTIFACTS_PATH_APP}/android-build-release-unsigned.apk
-  - echo ${QDS_VAR_PASS} | ${DOCKER_ENV_ANDROID_SDK_ROOT}/build-tools/${QDS_CI_ANDROID_SDK_VERSION}/apksigner sign -verbose -ks ${CI_PROJECT_DIR}/cicd/android/android_release.keystore -out ${QDS_CI_JOB_ARTIFACTS_PATH_TEST}/android-build-release.apk ${QDS_CI_JOB_ARTIFACTS_PATH_TEST}/android-build-release-unsigned.apk
+  - echo ${QDS_VAR_PASS} | ${QDS_CI_APK_SIGNER_PATH} sign -verbose -ks ${QDS_CI_KEYSTORE_PATH} -out ${QDS_CI_JOB_ARTIFACTS_PATH_APP}/android-build-release.apk ${QDS_CI_JOB_ARTIFACTS_PATH_APP}/android-build-release-unsigned.apk
+  - echo ${QDS_VAR_PASS} | ${QDS_CI_APK_SIGNER_PATH} sign -verbose -ks ${QDS_CI_KEYSTORE_PATH} -out ${QDS_CI_JOB_ARTIFACTS_PATH_TEST}/android-build-release.apk ${QDS_CI_JOB_ARTIFACTS_PATH_TEST}/android-build-release-unsigned.apk
   - rm -f ${QDS_CI_JOB_ARTIFACTS_PATH_APP}/android-build-release-unsigned.apk ${QDS_CI_JOB_ARTIFACTS_PATH_TEST}/android-build-release-unsigned.apk
 
 .copy-and-sign-aab: &copy-and-sign-aab
@@ -61,8 +64,6 @@
 build-android:
   extends: .pipeline_common
   stage: build
-  # rules:
-  #   - if: $CI_PIPELINE_SOURCE == "push" || $CI_PIPELINE_SOURCE == "web"
   parallel:
     matrix:
       - QDS_CI_JOB_TARGET_ARCH: "arm64_v8a"
diff --git a/src/backend/settings.cpp b/src/backend/settings.cpp
index 3e6eccf..cb04596 100644
--- a/src/backend/settings.cpp
+++ b/src/backend/settings.cpp
@@ -11,8 +11,9 @@
 /*
     Example of a settings.json file:
     {
-        "autoScale": true
-        "deviceUuid": "1234567890"
+        "autoScale": true,
+        "deviceUuid": "1234567890",
+        "keepScreenOn": false
     }
 */
 
-- 
GitLab