From 53892bbd0ad2b74334e1334ebec02bb860eaf8ac Mon Sep 17 00:00:00 2001
From: Martin Pulec <martin.pulec@cesnet.cz>
Date: Mon, 24 Nov 2025 10:51:46 +0100
Subject: [PATCH] CI Linux AppImage test: run tests for both distros

run the same test cases for both Arch Linux and Ubuntu

+ rename Dockerfile.arch to Dockerfile.archlinux (the former is a bit
misleading - arch==architecture or what?)
---
 .../scripts/Linux/docker_appimage_tests.sh    | 28 +++++++++----------
 .../{Dockerfile.arch => Dockerfile.archlinux} |  8 +++++-
 2 files changed, 21 insertions(+), 15 deletions(-)
 rename .github/scripts/Linux/utils/{Dockerfile.arch => Dockerfile.archlinux} (62%)

diff --git a/.github/scripts/Linux/docker_appimage_tests.sh b/.github/scripts/Linux/docker_appimage_tests.sh
index 711715a4d..19359acff 100755
--- a/.github/scripts/Linux/docker_appimage_tests.sh
+++ b/.github/scripts/Linux/docker_appimage_tests.sh
@@ -3,17 +3,17 @@
 mkdir aitest-context # empty build context
 ./UltraGrid-"$VERSION"-x86_64.AppImage --appimage-extract
 
-docker build -f .github/scripts/Linux/utils/Dockerfile.ubuntu\
- -t aitest-ubuntu aitest-context
-docker build -f .github/scripts/Linux/utils/Dockerfile.arch\
- -t aitest-arch aitest-context
-docker run --rm -v "$PWD"/squashfs-root/:/AppImage aitest-ubuntu\
- /AppImage/AppRun -v
-docker run --rm -v "$PWD"/squashfs-root/:/AppImage aitest-ubuntu\
- /AppImage/AppRun --tool uv-qt -h
-docker run --rm -v "$PWD"/squashfs-root/:/AppImage aitest-ubuntu\
- sh -c 'xvfb-run /AppImage/AppRun --tool uv-qt & { sleep 10; kill $!; }'
-docker run --rm -v "$PWD"/squashfs-root/:/AppImage aitest-ubuntu\
- /AppImage/AppRun --list-modules
-docker run --rm -v "$PWD"/squashfs-root:/AppImage aitest-arch\
- /AppImage/AppRun --capabilities
+for n in archlinux ubuntu; do
+        docker build -f .github/scripts/Linux/utils/Dockerfile.$n\
+         -t aitest-$n aitest-context
+        docker run --rm -v "$PWD"/squashfs-root/:/AppImage aitest-$n\
+         /AppImage/AppRun -v
+        docker run --rm -v "$PWD"/squashfs-root/:/AppImage aitest-$n\
+         /AppImage/AppRun --tool uv-qt -h
+        docker run --rm -v "$PWD"/squashfs-root/:/AppImage aitest-$n\
+         sh -c 'xvfb-run /AppImage/AppRun --tool uv-qt & { sleep 10; kill $!; }'
+        docker run --rm -v "$PWD"/squashfs-root/:/AppImage aitest-$n\
+         /AppImage/AppRun --list-modules
+        docker run --rm -v "$PWD"/squashfs-root:/AppImage aitest-$n\
+         /AppImage/AppRun --capabilities
+done
diff --git a/.github/scripts/Linux/utils/Dockerfile.arch b/.github/scripts/Linux/utils/Dockerfile.archlinux
similarity index 62%
rename from .github/scripts/Linux/utils/Dockerfile.arch
rename to .github/scripts/Linux/utils/Dockerfile.archlinux
index 97726c652..d2bd7f411 100644
--- a/.github/scripts/Linux/utils/Dockerfile.arch
+++ b/.github/scripts/Linux/utils/Dockerfile.archlinux
@@ -3,4 +3,10 @@ FROM archlinux
 RUN pacman --noconfirm -Sy archlinux-keyring
 RUN pacman-key --init
 RUN pacman-key --populate
-RUN pacman --noconfirm -Sy libglvnd libx11 fontconfig freetype2 jack2
+RUN pacman --noconfirm -Sy \
+    fontconfig \
+    freetype2 \
+    jack2\
+    libglvnd \
+    libx11 \
+