Skip to content

Commit 53892bb

Browse files
committed
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?)
1 parent e693ca0 commit 53892bb

File tree

2 files changed

+21
-15
lines changed

2 files changed

+21
-15
lines changed

.github/scripts/Linux/docker_appimage_tests.sh

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,17 @@
33
mkdir aitest-context # empty build context
44
./UltraGrid-"$VERSION"-x86_64.AppImage --appimage-extract
55

6-
docker build -f .github/scripts/Linux/utils/Dockerfile.ubuntu\
7-
-t aitest-ubuntu aitest-context
8-
docker build -f .github/scripts/Linux/utils/Dockerfile.arch\
9-
-t aitest-arch aitest-context
10-
docker run --rm -v "$PWD"/squashfs-root/:/AppImage aitest-ubuntu\
11-
/AppImage/AppRun -v
12-
docker run --rm -v "$PWD"/squashfs-root/:/AppImage aitest-ubuntu\
13-
/AppImage/AppRun --tool uv-qt -h
14-
docker run --rm -v "$PWD"/squashfs-root/:/AppImage aitest-ubuntu\
15-
sh -c 'xvfb-run /AppImage/AppRun --tool uv-qt & { sleep 10; kill $!; }'
16-
docker run --rm -v "$PWD"/squashfs-root/:/AppImage aitest-ubuntu\
17-
/AppImage/AppRun --list-modules
18-
docker run --rm -v "$PWD"/squashfs-root:/AppImage aitest-arch\
19-
/AppImage/AppRun --capabilities
6+
for n in archlinux ubuntu; do
7+
docker build -f .github/scripts/Linux/utils/Dockerfile.$n\
8+
-t aitest-$n aitest-context
9+
docker run --rm -v "$PWD"/squashfs-root/:/AppImage aitest-$n\
10+
/AppImage/AppRun -v
11+
docker run --rm -v "$PWD"/squashfs-root/:/AppImage aitest-$n\
12+
/AppImage/AppRun --tool uv-qt -h
13+
docker run --rm -v "$PWD"/squashfs-root/:/AppImage aitest-$n\
14+
sh -c 'xvfb-run /AppImage/AppRun --tool uv-qt & { sleep 10; kill $!; }'
15+
docker run --rm -v "$PWD"/squashfs-root/:/AppImage aitest-$n\
16+
/AppImage/AppRun --list-modules
17+
docker run --rm -v "$PWD"/squashfs-root:/AppImage aitest-$n\
18+
/AppImage/AppRun --capabilities
19+
done

.github/scripts/Linux/utils/Dockerfile.arch renamed to .github/scripts/Linux/utils/Dockerfile.archlinux

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,10 @@ FROM archlinux
33
RUN pacman --noconfirm -Sy archlinux-keyring
44
RUN pacman-key --init
55
RUN pacman-key --populate
6-
RUN pacman --noconfirm -Sy libglvnd libx11 fontconfig freetype2 jack2
6+
RUN pacman --noconfirm -Sy \
7+
fontconfig \
8+
freetype2 \
9+
jack2\
10+
libglvnd \
11+
libx11 \
12+

0 commit comments

Comments
 (0)