From 665b39259a454be12d5ab8344fe49a3b943a2468 Mon Sep 17 00:00:00 2001 From: Consolatis <35009135+Consolatis@users.noreply.github.com> Date: Tue, 26 Nov 2024 04:30:38 +0100 Subject: [PATCH] CI: make the smoke test start foot --- .github/workflows/build.yml | 6 +++--- scripts/ci/ci_autostart.sh | 8 ++++++-- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index aaad8864..7684423c 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -71,7 +71,7 @@ jobs: pacman -Syu --noconfirm pacman -S --noconfirm git meson clang wlroots libdrm libinput \ wayland-protocols cairo pango libxml2 xorg-xwayland librsvg \ - libdisplay-info gdb ttf-dejavu + libdisplay-info gdb ttf-dejavu foot - name: Install Debian Testing dependencies if: matrix.name == 'Debian' @@ -107,7 +107,7 @@ jobs: xbps-install -y git meson gcc clang pkg-config scdoc \ cairo-devel glib-devel libpng-devel librsvg-devel libxml2-devel \ pango-devel wlroots0.18-devel gdb bash xorg-server-xwayland \ - dejavu-fonts-ttf libsfdo-devel + dejavu-fonts-ttf libsfdo-devel foot # These build are executed on all runners - name: Build with gcc @@ -235,5 +235,5 @@ jobs: export CC=gcc meson setup build-gcc-gdb -Dxwayland=enabled --werror meson compile -C build-gcc-gdb - LABWC_RUNS=20 scripts/ci/smoke-test.sh build-gcc-gdb + LABWC_RUNS=2 scripts/ci/smoke-test.sh build-gcc-gdb ' | $TARGET diff --git a/scripts/ci/ci_autostart.sh b/scripts/ci/ci_autostart.sh index 4aa1c7f9..fa5697d7 100755 --- a/scripts/ci/ci_autostart.sh +++ b/scripts/ci/ci_autostart.sh @@ -1,4 +1,5 @@ #!/usr/bin/env bash +exec 1>&2 if test -z "$LABWC_PID"; then echo "LABWC_PID not set" >&2 @@ -7,7 +8,10 @@ fi echo "Running with pid $LABWC_PID" -# Could add runtime tests here +# Runtime tests +echo "Executing foot" +foot sh -c 'sleep 1; exit' +echo "Foot exited with $?" -echo "killing labwc" +echo "Killing labwc" kill -s TERM $LABWC_PID -- 2.52.0