From 50cf6d83ae09af76caf8c94606be6ff4d1fc294a Mon Sep 17 00:00:00 2001 From: wh201906 Date: Sun, 30 Oct 2022 04:14:03 +0000 Subject: [PATCH] Fix priv.wh201906.serialtest --- metadata/priv.wh201906.serialtest.yml | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/metadata/priv.wh201906.serialtest.yml b/metadata/priv.wh201906.serialtest.yml index 8bbd12140d..ef806543a1 100644 --- a/metadata/priv.wh201906.serialtest.yml +++ b/metadata/priv.wh201906.serialtest.yml @@ -90,9 +90,12 @@ 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) >> $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 + - if [ -n "$CI_PROJECT_DIR" ]; then make -j$(nproc) >> $CI_PROJECT_DIR/tmp/qt_build.log + 2>&1 || tail -n 200 $CI_PROJECT_DIR/tmp/qt_build.log; else make -j$(nproc); + fi + - if [ -n "$CI_PROJECT_DIR" ]; then make -j$(nproc) install >> $CI_PROJECT_DIR/tmp/qt_install.log + 2>&1 || tail -n 200 $CI_PROJECT_DIR/tmp/qt_install.log; else make -j$(nproc) + install; fi - cd ../../ - mkdir -pv fdroid-build - cd fdroid-build @@ -105,9 +108,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/ + - if [ -n "$CI_PROJECT_DIR" ]; then mkdir -pv $CI_PROJECT_DIR/unsigned/; fi + - if [ -n "$CI_PROJECT_DIR" ]; then cp -R $CI_PROJECT_DIR/build/priv.wh201906.serialtest/fdroid-build/android-build/build/outputs/apk/ + $CI_PROJECT_DIR/unsigned/; fi ndk: r21e AutoUpdateMode: Version