Merge branch 'master' into dantti/fix_linuxdeploy_log_include

Author: dantti

.github/workflows/main.yml

@@ -6,55 +6,56 @@ jobs:
   build-and-test:
     strategy:
       matrix:
-        ARCH: [x86_64, i386, aarch64, armhf]
-        USE_STATIC_RUNTIME: [""]
-        UPDATE: ["1"]
-        
         include:
-          # test build
+          # regular builds:
           - ARCH: x86_64
-            DOCKER_ARCH: amd64
-            BUILD_TYPE: coverage
+            BUILD_TYPE: appimage
+            RUNS_ON: ubuntu-24.04
+          - ARCH: i386
+            BUILD_TYPE: appimage
+            RUNS_ON: ubuntu-24.04
+          - ARCH: aarch64
+            BUILD_TYPE: appimage
+            RUNS_ON: ubuntu-24.04-arm
+          - ARCH: armhf
+            BUILD_TYPE: appimage
+            RUNS_ON: ubuntu-24.04-arm
 
-          # experimental build
+          # test build
           - ARCH: x86_64
-            BUILD_TYPE: appimage
-            USE_STATIC_RUNTIME: -static
+            BUILD_TYPE: coverage
+            RUNS_ON: ubuntu-24.04
 
       fail-fast: false
 
-    name: ${{ matrix.ARCH }}${{ matrix.USE_STATIC_RUNTIME }}
-    runs-on: ubuntu-latest
+    name: ${{ matrix.ARCH }} ${{ matrix.BUILD_TYPE }}
+    runs-on: ${{ matrix.RUNS_ON }}
 
     env:
       ARCH: ${{ matrix.ARCH }}
       BUILD_TYPE: ${{ matrix.BUILD_TYPE }}
       DEBIAN_FRONTEND: interactive
-      USE_STATIC_RUNTIME: ${{ matrix.USE_STATIC_RUNTIME }}
 
     steps:
       # check out once git command is available
       - uses: actions/checkout@v4
         with:
           submodules: recursive
 
-      - name: Set up QEMU integration for Docker
-        run: docker run --rm --privileged multiarch/qemu-user-static --reset -p yes
-
       - name: Build and test AppImage
         run: bash ci/build-in-docker.sh
 
       - name: Archive artifacts
         uses: actions/upload-artifact@v4
         with:
-          name: AppImage ${{ matrix.ARCH }}${{ matrix.USE_STATIC_RUNTIME}}
-          path: linuxdeploy-plugin-qt${{ matrix.USE_STATIC_RUNTIME}}-${{ matrix.ARCH }}.AppImage*
+          name: AppImage ${{ matrix.ARCH }}${{ matrix.BUILD_TYPE }}
+          path: linuxdeploy-plugin-qt-${{ matrix.ARCH }}.AppImage*
 
   upload:
     name: Create release and upload artifacts
     needs:
       - build-and-test
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
     steps:
       - name: Download artifacts
         uses: actions/download-artifact@v4

README.md

@@ -61,5 +61,5 @@ Just like all linuxdeploy plugins, the Qt plugin's behavior can be configured so
 - `$EXTRA_PLATFORM_PLUGINS=platformA;platformB`: Platforms to deploy in addition to `libqxcb.so`. Platform must be available from `QT_INSTALL_PLUGINS/platforms`.
 
 QML related:
-- `$QML_SOURCES_PATHS`: directory containing the application's QML files — useful/needed if QML files are "baked" into the binaries. `$QT_INSTALL_QML` is prepended to this list internally.
+- `$QML_SOURCES_PATHS`: directory containing the application's QML files — useful/needed if QML files are "baked" into the binaries. linuxdeploy-plugin-qt will look for all imported QML modules and include them. `$QT_INSTALL_QML` is prepended to this list internally.
 - `$QML_MODULES_PATHS`: extra directories containing imported QML files (normally doesn't need to be specified).

ci/build-in-docker.sh

@@ -18,7 +18,7 @@ error() {
     log_message 1 "[error] $*"
 }
 
-if [[ "$ARCH" == "" ]]; then
+if [[ "${ARCH:-}" == "" ]]; then
     error "Usage: env ARCH=... bash $0"
     exit 2
 fi
@@ -29,16 +29,16 @@ this_dir="$(readlink -f "$(dirname "${BASH_SOURCE[0]}")")"
 
 case "$ARCH" in
     x86_64)
-        docker_arch=amd64
+        docker_platform=linux/amd64
         ;;
     i386)
-        docker_arch=i386
+        docker_platform=linux/386
         ;;
     armhf)
-        docker_arch=arm32v7
+        docker_platform=linux/arm/v7
         ;;
     aarch64)
-        docker_arch=arm64v8
+        docker_platform=linux/arm64/v8
         ;;
     *)
         echo "Unsupported \$ARCH: $ARCH"
@@ -49,7 +49,7 @@ esac
 # first, we need to build the image
 # we always attempt to build it, it will only be rebuilt if Docker detects changes
 # optionally, we'll pull the base image beforehand
-info "Building Docker image for $ARCH (Docker arch: $docker_arch)"
+info "Building Docker image for $ARCH (Docker platform: $docker_platform)"
 
 build_args=()
 if [[ "${UPDATE:-}" == "" ]]; then
@@ -58,11 +58,11 @@ else
     build_args+=("--pull")
 fi
 
-docker_image=linuxdeploy-plugin-qt-build:"$ARCH"
+docker_image=linuxdeploy-plugin-qt-build
 
 docker build \
+    --platform "$docker_platform" \
     --build-arg ARCH="$ARCH" \
-    --build-arg docker_arch="$docker_arch" \
     "${build_args[@]}" \
     -t "$docker_image" \
     "$this_dir"/docker
@@ -104,11 +104,12 @@ run_in_docker() {
     #   b) allow the build scripts to "mv" the binaries into the /out directory
     docker run \
         --rm \
+        --platform "$docker_platform" \
         -i \
         --init \
+        -e ARCH \
         -e GITHUB_RUN_NUMBER \
         -e USE_STATIC_RUNTIME \
-        -e ARCH \
         -e CI \
         --user "$uid" \
         "${docker_args[@]}" \
@@ -119,7 +120,7 @@ run_in_docker() {
 }
 
 filename_suffix=
-if [[ "$USE_STATIC_RUNTIME" != "" ]]; then
+if [[ "${USE_STATIC_RUNTIME:-}" != "" ]]; then
     filename_suffix="-static"
 fi
 

ci/build.sh

@@ -47,7 +47,7 @@ export OUTPUT="linuxdeploy-plugin-qt-$ARCH.AppImage"
 
 # special set of builds using a different experimental runtime, used for testing purposes
 if [[ "${USE_STATIC_RUNTIME:-}" != "" ]]; then
-    custom_runtime_url="https://github.com/AppImage/type2-runtime/releases/download/continuous/runtime-fuse3-$ARCH"
+    custom_runtime_url="https://github.com/AppImage/type2-runtime/releases/download/continuous/runtime-$ARCH"
     wget "$custom_runtime_url"
     runtime_filename="$(echo "$custom_runtime_url" | rev | cut -d/ -f1 | rev)"
     LDAI_RUNTIME_FILE="$(readlink -f "$runtime_filename")"

ci/docker/Dockerfile

@@ -3,18 +3,12 @@
 # needs to be re-run in CI every time as we cannot store auto-built Docker images due to GitHub's strict quota
 # it will save a lot of time in local development environments, though
 
-ARG docker_arch
-
 # we'll just use Debian as a base image for now, mainly because it produces less headache than Ubuntu with arm
 # a big pro is that they ship an up to date CMake in their stable distribution
 # also, they still provide IA-32 builds for some reason...
 # some people in the AppImage community do not (want to) realize i386 is dead for good
 # we are going to drop i686 in the future!
-FROM ${docker_arch}/debian:stable
-
-# variables that need to be availabe during build and runtime must(!) be repeated after FROM
-ARG ARCH
-
+FROM debian:stable
 
 SHELL ["bash", "-x", "-c"]
 

src/deployers/BasicPluginsDeployer.cpp

@@ -39,6 +39,10 @@ bool BasicPluginsDeployer::deployStandardQtPlugins(const std::vector<std::string
     for (const auto &pluginName : plugins) {
         ldLog() << "Deploying Qt" << pluginName << "plugins" << std::endl;
         for (fs::directory_iterator i(qtPluginsPath / pluginName); i != fs::directory_iterator(); ++i) {
+            if (i->path().extension() == ".debug") {
+                ldLog() << LD_DEBUG << "skipping .debug file:" << i->path() << std::endl;
+                continue;
+            }
             // add a trailing slash, so pluginName is used as a destination directory, not a file.
             if (!appDir.deployLibrary(*i, appDir.path() / "usr/plugins" / pluginName / ""))
                 return false;

src/deployers/TextToSpeechPluginsDeployer.cpp

@@ -13,26 +13,5 @@ using namespace linuxdeploy::log;
 namespace fs = std::filesystem;
 
 bool TextToSpeechPluginsDeployer::doDeploy() {
-    // calling the default code is optional, but it won't hurt for now
-    if (!BasicPluginsDeployer::deploy())
-        return false;
-
-    const std::string pluginsName = "texttospeech";
-
-    ldLog() << "Deploying" << pluginsName << "plugins" << std::endl;
-
-    for (fs::directory_iterator i(qtPluginsPath / pluginsName); i != fs::directory_iterator(); ++i) {
-        if (i->path().extension() == ".debug") {
-            ldLog() << LD_DEBUG << "skipping .debug file:" << i->path() << std::endl;
-            continue;
-        }
-
-        // terminate with a "/" to make sure the deployer will deploy the file into the target directory properly
-        // has to be cast to string, unfortunately, as std::filesystem doesn't allow for adding a terminating /
-        const auto targetPath = (appDir.path() / "usr/plugins/" / pluginsName).string() + "/";
-        if (!appDir.deployLibrary(*i, targetPath))
-            return false;
-    }
-
-    return true;
+    return deployStandardQtPlugins({"texttospeech"});
 }

src/deployment.h

@@ -37,6 +37,10 @@ inline bool deployIntegrationPlugins(appdir::AppDir& appDir, const fs::path& qtP
             // otherwise, when the directory doesn't exist, it might just copy all files to files called like
             // destinationDir
             auto destinationDir = appDir.path() / "usr/plugins" / subDir / "";
+            if (i->path().extension() == ".debug") {
+                ldLog() << LD_DEBUG << "skipping .debug file:" << i->path() << std::endl;
+                continue;
+            }
 
             if (!appDir.deployLibrary(*i, destinationDir))
                 return false;

src/util.cpp

@@ -69,6 +69,9 @@ std::filesystem::path findQmake() {
 
         if (qmakePath.empty())
             qmakePath = linuxdeploy::util::which("qmake");
+
+        if (qmakePath.empty())
+            qmakePath = linuxdeploy::util::which("qmake6");
     }
 
     return qmakePath;