Merge pull request #9305 from nextcloud/bugfix/fixBuildOfAppImageWithNewerBuildImage

chore: use newer build image with Qt 6.9.3 release as expected

Author: mgallien

.github/workflows/linux-appimage.yml

@@ -9,7 +9,7 @@ jobs:
   build:
     name: Linux Appimage Package
     runs-on: ubuntu-latest
-    container: ghcr.io/nextcloud/continuous-integration-client-appimage-qt6:client-appimage-el8-6.8.3-1
+    container: ghcr.io/nextcloud/continuous-integration-client-appimage-qt6:client-appimage-el8-6.9.3-2
     steps:
       - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
         with:
@@ -20,7 +20,7 @@ jobs:
         env:
           PR_ID: ${{ github.event.number }}
         run: |
-            BUILDNR=${GITHUB_RUN_ID} VERSION_SUFFIX=${GITHUB_HEAD_REF} BUILD_UPDATER=ON DESKTOP_CLIENT_ROOT=`pwd` EXECUTABLE_NAME=nextcloud QT_BASE_DIR=/opt/qt OPENSSL_ROOT_DIR=/usr/local/lib64  /bin/bash -c "./admin/linux/build-appimage.sh"
+            BUILDNR=${GITHUB_RUN_ID} VERSION_SUFFIX=${GITHUB_HEAD_REF} BUILD_UPDATER=ON DESKTOP_CLIENT_ROOT=`pwd` EXECUTABLE_NAME=nextcloud QT_BASE_DIR=/root/linux-gcc-x86_64 /bin/bash -c "./admin/linux/build-appimage.sh"
 
       - name: Upload AppImage artifact
         id: upload-appimage

.github/workflows/linux-clang-compile-tests.yml

@@ -8,7 +8,7 @@ jobs:
   build:
     name: Linux Clang compilation and tests
     runs-on: ubuntu-latest
-    container: ghcr.io/nextcloud/continuous-integration-client-qt6:client-trixie-6.8.2-2
+    container: ghcr.io/nextcloud/continuous-integration-client-qt6:client-forky-6.9.2-1
     steps:
       - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
         with:

.github/workflows/linux-gcc-compile-tests.yml

@@ -8,7 +8,7 @@ jobs:
   build:
     name: Linux GCC compilation and tests
     runs-on: ubuntu-latest
-    container: ghcr.io/nextcloud/continuous-integration-client-qt6:client-trixie-6.8.2-2
+    container: ghcr.io/nextcloud/continuous-integration-client-qt6:client-forky-6.9.2-1
     steps:
       - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
         with:

admin/linux/build-appimage.sh

@@ -24,8 +24,8 @@ if [ "$BUILD_UPDATER" != "OFF" ]; then
 fi
 
 # Ensure we use gcc-11 on RHEL-like systems
-if [ -e "/opt/rh/gcc-toolset-11/enable" ]; then
-    source /opt/rh/gcc-toolset-11/enable
+if [ -e "/opt/rh/gcc-toolset-14/enable" ]; then
+    source /opt/rh/gcc-toolset-14/enable
 fi
 
 mkdir /app

craftmaster.ini

@@ -57,11 +57,13 @@ Paths/Python = /Users/runner/hostedtoolcache/Python/3.12.3/arm64
 [linux-gcc-x86_64]
 General/ABI = linux-gcc-x86_64
 Paths/Python = /usr/bin/python3
+Packager/RepositoryUrl = https://files.kde.org/craft/Qt6/
+Packager/CacheVersion = 25.12
 
 [Env]
 CRAFT_CODESIGN_CERTIFICATE =
 SIGN_PACKAGE = False
 
 [Custom_Variables_for_Brander]
-qtPath = /opt/qt
-dockerImage = ghcr.io/nextcloud/continuous-integration-client-appimage-qt6:client-appimage-el8-6.8.3-1
+qtPath = /root/linux-gcc-x86_64
+dockerImage = ghcr.io/nextcloud/continuous-integration-client-appimage-qt6:client-appimage-el8-6.9.3-2

src/gui/tooltipupdater.h

@@ -4,6 +4,8 @@
  * SPDX-License-Identifier: GPL-2.0-or-later
  */
 
+#pragma once
+
 #include <QObject>
 #include <QPoint>
 

src/libsync/bulkpropagatordownloadjob.cpp

@@ -30,7 +30,7 @@ BulkPropagatorDownloadJob::BulkPropagatorDownloadJob(OwncloudPropagator *propaga
 
 namespace
 {
-static QString makeRecallFileName(const QString &fn)
+static QString makeBulkDownloadRecallFileName(const QString &fn)
 {
     auto recallFileName(fn);
     // Add _recall-XXXX  before the extension.
@@ -46,9 +46,9 @@ static QString makeRecallFileName(const QString &fn)
     return recallFileName;
 }
 
-void handleRecallFile(const QString &filePath, const QString &folderPath, SyncJournalDb &journal)
+void handleBulkDownloadRecallFile(const QString &filePath, const QString &folderPath, SyncJournalDb &journal)
 {
-    qCDebug(lcBulkPropagatorDownloadJob) << "handleRecallFile: " << filePath;
+    qCDebug(lcBulkPropagatorDownloadJob) << "handleBulkDownloadRecallFile: " << filePath;
 
     FileSystem::setFileHidden(filePath, true);
 
@@ -81,7 +81,7 @@ void handleRecallFile(const QString &filePath, const QString &folderPath, SyncJo
 
         qCInfo(lcBulkPropagatorDownloadJob) << "Recalling" << localRecalledFile << "Checksum:" << record._checksumHeader;
 
-        const auto &targetPath = makeRecallFileName(recalledFile);
+        const auto &targetPath = makeBulkDownloadRecallFileName(recalledFile);
 
         qCDebug(lcBulkPropagatorDownloadJob) << "Copy recall file: " << recalledFile << " -> " << targetPath;
         // Remove the target first, QFile::copy will not overwrite it.
@@ -197,7 +197,7 @@ bool BulkPropagatorDownloadJob::updateMetadata(const SyncFileItemPtr &item)
     // handle the special recall file
     if (!item->_remotePerm.hasPermission(RemotePermissions::IsShared)
         && (item->_file == QLatin1String(".sys.admin#recall#") || item->_file.endsWith(QLatin1String("/.sys.admin#recall#")))) {
-        handleRecallFile(fullFileName, propagator()->localPath(), *propagator()->_journal);
+        handleBulkDownloadRecallFile(fullFileName, propagator()->localPath(), *propagator()->_journal);
     }
 
     const auto isLockOwnedByCurrentUser = item->_lockOwnerId == propagator()->account()->davUser();