From 5260aad8c9bbd30ff2446479f679793df4dd3dcd Mon Sep 17 00:00:00 2001
From: wh201906 <wh201906@yandex.com>
Date: Sat, 29 Oct 2022 07:18:44 +0000
Subject: [PATCH] Update priv.wh201906.serialtest

---
 metadata/priv.wh201906.serialtest.yml | 21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/metadata/priv.wh201906.serialtest.yml b/metadata/priv.wh201906.serialtest.yml
index 1abbe062e7..8bbd12140d 100644
--- a/metadata/priv.wh201906.serialtest.yml
+++ b/metadata/priv.wh201906.serialtest.yml
@@ -61,23 +61,24 @@ Builds:
 
   - versionName: V0.2.2
     versionCode: 22
-    commit: 3245202cb00e520130cae4d9b473e6f8f085e667
+    commit: V0.2.2
     sudo:
       - apt-get update
       - apt-get install -y build-essential wget
     output: fdroid-build/android-build/build/outputs/apk/release/android-build-release-unsigned.apk
     build:
-      - $ANDROID_HOME/tools/bin/sdkmanager "platforms;android-31"
+      - sdkmanager "platforms;android-31"
       - mkdir -pv build-qt
       - cd build-qt
-      - wget -cq https://download.qt.io/official_releases/qt/5.15/5.15.5/single/qt-everywhere-opensource-src-5.15.5.tar.xz
-      - echo "5a97827bdf9fd515f43bc7651defaf64fecb7a55e051c79b8f80510d0e990f06 qt-everywhere-opensource-src-5.15.5.tar.xz"
+      - wget -cq https://download.qt.io/official_releases/qt/5.15/5.15.7/single/qt-everywhere-opensource-src-5.15.7.tar.xz
+      - echo "8a71986676a3f37a198a9113acedbfd5bc5606a459b6b85816d951458adbe9a0 qt-everywhere-opensource-src-5.15.7.tar.xz"
         | sha256sum -c -
-      - tar -xkf qt-everywhere-opensource-src-5.15.5.tar.xz
+      - tar -xkf qt-everywhere-opensource-src-5.15.7.tar.xz
+      - rm -rf ./qt-everywhere-src-5.15.7/qtpurchasing/examples
       - mkdir qt5
       - mkdir build
       - cd build
-      - ../qt-everywhere-src-5.15.5/configure -xplatform android-clang --disable-rpath
+      - ../qt-everywhere-src-5.15.7/configure -xplatform android-clang --disable-rpath
         -no-warnings-are-errors -prefix $(pwd)/../qt5 -android-ndk $$NDK$$ -android-sdk
         $$SDK$$ -opensource -confirm-license -release -nomake examples -nomake tests
         -no-compile-examples -no-feature-testlib -skip qt3d -skip qtactiveqt -skip
@@ -89,8 +90,9 @@ Builds:
         qtlottie -skip qtquick3d -skip qtquicktimeline -skip qtscript -skip qtsensors
         -skip qtserialbus -skip qttools -skip qtxmlpatterns -skip qtwebglplugin -skip
         qtwebchannel -skip qtvirtualkeyboard -skip qttranslations
-      - make -j$(nproc)
-      - make -j$(nproc) install
+      - make -j$(nproc) >> $CI_PROJECT_DIR/tmp/qt_build.log 2>&1 || tail -n 200 $CI_PROJECT_DIR/tmp/qt_build.log
+      - make -j$(nproc) install >> $CI_PROJECT_DIR/tmp/qt_install.log 2>&1 || tail
+        -n 200 $CI_PROJECT_DIR/tmp/qt_install.log
       - cd ../../
       - mkdir -pv fdroid-build
       - cd fdroid-build
@@ -103,6 +105,9 @@ Builds:
       - make -j$(nproc) apk_install_target
       - ../build-qt/qt5/bin/androiddeployqt --release --output android-build/ --input
         android-SerialTest-deployment-settings.json
+      - mkdir -pv $CI_PROJECT_DIR/unsigned/
+      - cp -R $CI_PROJECT_DIR/build/priv.wh201906.serialtest/fdroid-build/android-build/build/outputs/apk/
+        $CI_PROJECT_DIR/unsigned/
     ndk: r21e
 
 AutoUpdateMode: Version