From cd18437746eb57702333d2e1bea2c7016ac9b387 Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Wed, 29 Jul 2026 22:12:52 +1000 Subject: [PATCH 1/2] tools: exit quietly if /dev/input isn't present For purposes of running in a container-based CI (rather than a VM). --- tools/list-local-devices.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tools/list-local-devices.c b/tools/list-local-devices.c index 154c3a947..b256a035c 100644 --- a/tools/list-local-devices.c +++ b/tools/list-local-devices.c @@ -344,6 +344,9 @@ main(int argc, dir = g_dir_open("/dev/input", 0, &error); if (!dir) { + /* Probably running in a container */ + if (error->domain == G_FILE_ERROR && error->code == G_FILE_ERROR_NOENT) + return EXIT_SUCCESS; fprintf(stderr, "%s\n", error->message); return EXIT_FAILURE; } From 06ec61e568eb8387b9890be2e94a3a666d212d62 Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Wed, 29 Jul 2026 22:31:33 +1000 Subject: [PATCH 2/2] CI: switch to = comparison for /bin/sh compatibility Doesn't really matter in our CI the runners default to bash (?) but it costs nothing. --- .github/workflows/main.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 8694cbbf7..61a9b9163 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -211,8 +211,8 @@ jobs: # We expect the overridden match *not* to be listed - name: check for the expected devices to be present (or not present) run: | - test "$(libwacom-list-devices --format=yaml | yq -r '.devices[] | select(.bus == "usb") | select(.vid == "0x056a") | select(.pid == "0x032a") | .name')" == "Wacom Cintiq 27QHD MODIFIED" - test "$(libwacom-list-devices --format=yaml | yq -r '.devices[] | select(.bus == "bluetooth") | select(.vid == "0x056a") | select(.pid == "0x0361") | .name')" == "Wacom Intuos Pro L MODIFIED" + test "$(libwacom-list-devices --format=yaml | yq -r '.devices[] | select(.bus == "usb") | select(.vid == "0x056a") | select(.pid == "0x032a") | .name')" = "Wacom Cintiq 27QHD MODIFIED" + test "$(libwacom-list-devices --format=yaml | yq -r '.devices[] | select(.bus == "bluetooth") | select(.vid == "0x056a") | select(.pid == "0x0361") | .name')" = "Wacom Intuos Pro L MODIFIED" test $(libwacom-list-devices --format=yaml | yq -r '.devices[] | select(.bus == "usb") | select(.vid == "0x056a") | select(.pid == "0x0358") | .name' | wc -l) -eq 0 test $(libwacom-list-devices --format=yaml | yq -r '.devices[] | select(.bus == "usb") | select(.vid == "0x056a") | select(.pid == "0x032a") | .name' | wc -l) -eq 1