Fix CI build

Author: Gemba

src/config.cpp

@@ -246,6 +246,9 @@ void Config::setupUserConfig() {
 
     QString localEtcPath = QString(SYSCONFDIR "/skyscraper/");
     if (!QFileInfo::exists(localEtcPath) || isRpInstall) {
+        if (!isRpInstall) {
+            qDebug() << "local install path does not exist" << localEtcPath;
+        }
         // RetroPie or Windows installation type: handled externally
         return;
     }
@@ -269,21 +272,20 @@ void Config::setupUserConfig() {
             dest = dest.replace("resources/", "");
         } else if ((src == "peas.json" || src == "platforms_idmap.csv")) {
             isPristine = isPlatformCfgPristine(tgtDir % "/" % dest);
-            // isPristine == 1: keep new file in *.dist
+            // isPristine == 1: keep updated files from release in *.dist
             if (isPristine == 0) {
                 configFiles[src].second = FileOp::OVERWRITE;
             } else if (isPristine < 0) {
-                ncprintf(
-                    "\033[1;31mFile '%s' does not exist or cannot be read. "
-                    "Please fix. Quitting.\033[0m\n",
-                    (tgtDir % "/" % dest).toUtf8().constData());
+                ncprintf("\033[1;31mFile '%s' cannot be read. "
+                         "Please fix. Quitting.\033[0m\n",
+                         (tgtDir % "/" % dest).toUtf8().constData());
                 emit die(1,
                          QString("cannot access '%1'").arg(tgtDir % "/" % dest),
-                         "File does not exist or permission denied");
+                         "Permission denied");
             }
         }
         QString tgt = tgtDir % "/" % dest;
-        copyFile(localEtcPath % src, tgt, isPristine,
+        copyFile(localEtcPath % src, tgt, isPristine == 0,
                  configFiles.value(src).second);
     }
 }

src/platform.cpp

@@ -278,7 +278,9 @@ bool Platform::loadPlatformsIdMap() {
   Whereas user edits in such files should go into _local files (introduced with
   3.13).
 */
-// 0: pristine, 1: local changes, -1 not readable, -2 non existing
+// 0: pristine or not existing (-> overwrite),
+// 1: local changes,
+// -1 not readable (permission error)
 int Platform::isPlatformCfgfilePristine(const QString &cfgFilePath) {
     QMap<QString, QStringList> sha256sums = {
         // clang-format off
@@ -309,7 +311,7 @@ int Platform::isPlatformCfgfilePristine(const QString &cfgFilePath) {
     };
     QFileInfo cfgFileInfo = QFileInfo(cfgFilePath);
     if (!cfgFileInfo.exists()) {
-        return -2;
+        return 0;
     }
 
     QCryptographicHash sha256 = QCryptographicHash(QCryptographicHash::Sha256);

supplementary/workflows/install

@@ -32,12 +32,14 @@ build() {
    cd "$SKYSCRAPER_HOME"
    # Qt5
    make --ignore-errors distclean || true
+   sed -ie "0,/CONFIG += /{s/CONFIG.*/CONFIG += debug/}" skyscraper.pro
    qmake
    jobs=$(getconf _NPROCESSORS_ONLN 2>/dev/null || sysctl -n hw.ncpu)
    make "-j$jobs"
    sudo make install
    # Qt6, without make install
    make --ignore-errors distclean || true
+   sed -ie "0,/CONFIG += /{s/CONFIG.*/CONFIG += release/}" skyscraper.pro
    qmake6
    make "-j$jobs"
 }

supplementary/workflows/test

@@ -15,9 +15,9 @@ _test_android() {
 
 _smoke_test() {
 	# Qt5
-	/usr/local/bin/Skyscraper --buildinfo
+	/usr/local/bin/Skyscraper --buildinfo | grep -q -oPz "(?s)Skyscraper:\s+\d+\..+Qt:\s+5\."
 	# Qt6
-	"${SKYSCRAPER_HOME}/Skyscraper" --buildinfo
+	"${SKYSCRAPER_HOME}/Skyscraper" --buildinfo | grep -q -oPz "(?s)Skyscraper:\s+\d+\..+Qt:\s+6\."
 }
 
 _unit_tests() {
@@ -59,8 +59,7 @@ main() {
 	case "${1:-}" in
 	"android-aarch64") _test_android "aarch64" ;;
 	"android-arm") _test_android "ARM" ;;
-	*) _unit_tests && _exit_test;;
-	#*) _smoke_test;;
+	*) _smoke_test && _unit_tests && _exit_test;;
 	esac
 }
 

test/abstractscraper/test_abstractscraper.cpp

@@ -31,7 +31,7 @@ private slots:
 
     void testDetectRegionsFromFilename2() {
         scraper = new AbstractScraper(&settings, NULL);
-        QFileInfo info("Gametitle (j) world.zip");
+        QFileInfo info("Gametitle (j) (world).zip");
         QList<QString> regionPriosExp;
         regionPriosExp.append("jp");
         regionPriosExp.append("wor");
@@ -40,11 +40,11 @@ private slots:
 
     void testDetectRegionsFromFilename3() {
         scraper = new AbstractScraper(&settings, NULL);
-        QFileInfo info("Gametitle (france) wOrLD (j).zip");
+        QFileInfo info("Gametitle (france) (wOrLD) (j).zip");
         QList<QString> regionPriosExp;
         regionPriosExp.append("fr");
-        regionPriosExp.append("jp");
         regionPriosExp.append("wor");
+        regionPriosExp.append("jp");
         match(info, regionPriosExp);
         qDebug() << info.completeBaseName();
         qDebug() << regionPriosExp;