From c1c50a2ffa69f3f50dd3ce0e5e6c97effeccd482 Mon Sep 17 00:00:00 2001 From: Sebastian Wick Date: Tue, 7 Jan 2025 16:13:27 +0100 Subject: [PATCH] FIXME: Use ubuntu:rolling for CI --- .github/workflows/Containerfile | 4 ++-- .github/workflows/container.yml | 2 +- tests/test_usb.py | 1 - 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/.github/workflows/Containerfile b/.github/workflows/Containerfile index ad7e899dc..918286a3d 100644 --- a/.github/workflows/Containerfile +++ b/.github/workflows/Containerfile @@ -2,7 +2,7 @@ # When this file is changed, or one needs to rebuild the image for another # reason, bump the `IMAGE_TAG` in the container.yml workflow. -FROM ubuntu:latest +FROM ubuntu:rolling RUN apt update RUN apt upgrade -y @@ -36,7 +36,7 @@ RUN apt install -y --no-install-recommends \ libsystemd-dev \ libtool \ llvm \ - libclang-rt-18-dev \ + libclang-rt-19-dev \ python3-gi \ shared-mime-info diff --git a/.github/workflows/container.yml b/.github/workflows/container.yml index 7ecf61d3b..99b6ec3e1 100644 --- a/.github/workflows/container.yml +++ b/.github/workflows/container.yml @@ -1,5 +1,5 @@ env: - IMAGE_TAG: 20241211-1 + IMAGE_TAG: 20250107-1 on: workflow_call: diff --git a/tests/test_usb.py b/tests/test_usb.py index a0d4f45e9..9ad3f0fb3 100644 --- a/tests/test_usb.py +++ b/tests/test_usb.py @@ -188,7 +188,6 @@ def cb_device_events(session_handle, events): ) @pytest.mark.parametrize("usb_queries", ["vnd:04a9", None]) - @pytest.mark.skipif(xdp.is_in_container(), reason="Test fail in containers") def test_device_remove(self, portals, dbus_con, app_id, usb_queries, umockdev): usb_intf = xdp.get_portal_iface(dbus_con, "Usb")