From b1a9e0e890e591fbd371a3f0ff93806741aad1c2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Guido=20G=C3=BCnther?= Date: Fri, 26 Sep 2025 17:02:44 +0200 Subject: [PATCH 01/15] batterinfo: Fix indent MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Gbp-Dch: Ignore Signed-off-by: Guido Günther Part-of: --- src/batteryinfo.c | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/src/batteryinfo.c b/src/batteryinfo.c index 844807028..d59c1a11b 100644 --- a/src/batteryinfo.c +++ b/src/batteryinfo.c @@ -14,7 +14,6 @@ #include "batteryinfo.h" #include "upower.h" -#include "util.h" #include @@ -88,15 +87,15 @@ phosh_battery_info_get_property (GObject *object, static void -on_property_changed (PhoshBatteryInfo *self, - GParamSpec *pspec, - UpDevice *device) +on_property_changed (PhoshBatteryInfo *self, + GParamSpec *pspec, + UpDevice *device) { - UpDeviceState state; - gdouble percentage; - gint smallest_ten; - gboolean is_charging; - gboolean is_charged; + UpDeviceState state; + gdouble percentage; + gint smallest_ten; + gboolean is_charging; + gboolean is_charged; g_autofree char *icon_name = NULL; g_autofree char *info = NULL; @@ -110,11 +109,10 @@ on_property_changed (PhoshBatteryInfo *self, if (is_charged) { icon_name = g_strdup ("battery-level-100-charged-symbolic"); } else { - if (is_charging) { + if (is_charging) icon_name = g_strdup_printf ("battery-level-%d-charging-symbolic", smallest_ten); - } else { + else icon_name = g_strdup_printf ("battery-level-%d-symbolic", smallest_ten); - } } phosh_status_icon_set_icon_name (PHOSH_STATUS_ICON (self), icon_name); phosh_status_icon_set_info (PHOSH_STATUS_ICON (self), info); -- GitLab From 9865891632a5f9a4088b35ffa45e4954eaf79ba4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Guido=20G=C3=BCnther?= Date: Fri, 26 Sep 2025 17:19:00 +0200 Subject: [PATCH 02/15] location-manager: Avoid cast MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This gives us more type safety Signed-off-by: Guido Günther Part-of: --- src/location-manager.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/location-manager.c b/src/location-manager.c index 81e881570..4a7b411b9 100644 --- a/src/location-manager.c +++ b/src/location-manager.c @@ -332,10 +332,11 @@ on_bus_acquired (GObject *source_object, static void -on_add_agent_ready (PhoshGeoClueDBusManager *manager, - GAsyncResult *res, - gpointer user_data) +on_add_agent_ready (GObject *source_object, + GAsyncResult *res, + gpointer user_data) { + PhoshGeoClueDBusManager *manager = PHOSH_GEO_CLUE_DBUS_MANAGER (source_object); g_autoptr (GError) err = NULL; if (phosh_geo_clue_dbus_manager_call_add_agent_finish (manager, res, &err)) @@ -385,7 +386,7 @@ on_manager_proxy_ready (GObject *source_object, /* Agent whitelisted in geoclue conf */ "sm.puri.Phosh", NULL, - (GAsyncReadyCallback)on_add_agent_ready, + on_add_agent_ready, NULL); g_signal_connect_swapped (self->manager_proxy, "notify::in-use", -- GitLab From 9d721bbc45be268c9f9be6df69b3bfb35354ff54 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Guido=20G=C3=BCnther?= Date: Fri, 26 Sep 2025 17:05:34 +0200 Subject: [PATCH 03/15] location-manager: Use cancellable more MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cancel these calls too on shutdown Signed-off-by: Guido Günther Part-of: --- src/location-manager.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/location-manager.c b/src/location-manager.c index 4a7b411b9..4d63f41ae 100644 --- a/src/location-manager.c +++ b/src/location-manager.c @@ -385,7 +385,7 @@ on_manager_proxy_ready (GObject *source_object, phosh_geo_clue_dbus_manager_call_add_agent (self->manager_proxy, /* Agent whitelisted in geoclue conf */ "sm.puri.Phosh", - NULL, + self->cancel, on_add_agent_ready, NULL); g_signal_connect_swapped (self->manager_proxy, @@ -410,7 +410,7 @@ on_manager_name_appeared (GDBusConnection *connection, G_DBUS_PROXY_FLAGS_NONE, GEOCLUE_SERVICE, GEOCLUE_MANAGER_PATH, - NULL, + self->cancel, (GAsyncReadyCallback)on_manager_proxy_ready, self); } -- GitLab From 0edd8a15ca6cfa1e032ad1e066691419dabe1c61 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Guido=20G=C3=BCnther?= Date: Fri, 26 Sep 2025 14:55:03 +0200 Subject: [PATCH 04/15] proximity-manager: Use cancellable MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fixes a test suite crash Signed-off-by: Guido Günther Part-of: --- src/proximity.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/proximity.c b/src/proximity.c index d1c0c0c6e..cc8bb4860 100644 --- a/src/proximity.c +++ b/src/proximity.c @@ -42,6 +42,8 @@ typedef struct _PhoshProximity { PhoshSensorProxyManager *sensor_proxy_manager; PhoshCallsManager *calls_manager; PhoshFader *fader; + + GCancellable *cancel; } PhoshProximity; G_DEFINE_TYPE (PhoshProximity, phosh_proximity, G_TYPE_OBJECT); @@ -139,13 +141,13 @@ phosh_proximity_claim_proximity (PhoshProximity *self, gboolean claim) if (claim) { phosh_dbus_sensor_proxy_call_claim_proximity ( PHOSH_DBUS_SENSOR_PROXY (self->sensor_proxy_manager), - NULL, + self->cancel, (GAsyncReadyCallback)on_proximity_claimed, self); } else { phosh_dbus_sensor_proxy_call_release_proximity ( PHOSH_DBUS_SENSOR_PROXY (self->sensor_proxy_manager), - NULL, + self->cancel, (GAsyncReadyCallback)on_proximity_released, self); } @@ -289,6 +291,9 @@ phosh_proximity_dispose (GObject *object) { PhoshProximity *self = PHOSH_PROXIMITY (object); + g_cancellable_cancel (self->cancel); + g_clear_object (&self->cancel); + if (self->sensor_proxy_manager) { g_signal_handlers_disconnect_by_data (self->sensor_proxy_manager, self); @@ -353,6 +358,7 @@ phosh_proximity_class_init (PhoshProximityClass *klass) static void phosh_proximity_init (PhoshProximity *self) { + self->cancel = g_cancellable_new (); } -- GitLab From a3c27d1933f47d0e76b53c2dafec3461b576a443 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Guido=20G=C3=BCnther?= Date: Fri, 26 Sep 2025 17:09:40 +0200 Subject: [PATCH 05/15] location-manager: Dispose connection on shutdown MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The object returned by `g_bus_get_finish()` is a singleton but we need to unref it nevertheless. Signed-off-by: Guido Günther Part-of: --- src/location-manager.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/location-manager.c b/src/location-manager.c index 4d63f41ae..5d1f295c4 100644 --- a/src/location-manager.c +++ b/src/location-manager.c @@ -70,6 +70,7 @@ typedef struct _PhoshLocationManager { GSettings *location_settings; gboolean enabled; gboolean active; + GDBusConnection *connection; /* Current Request */ GtkWidget *prompt; @@ -308,9 +309,7 @@ phosh_location_manager_geoclue2_agent_iface_init (PhoshGeoClueDBusOrgFreedesktop static void -on_bus_acquired (GObject *source_object, - GAsyncResult *res, - gpointer user_data) +on_bus_acquired (GObject *source_object, GAsyncResult *res, gpointer user_data) { g_autoptr (GError) err = NULL; PhoshLocationManager *self; @@ -323,8 +322,9 @@ on_bus_acquired (GObject *source_object, } self = PHOSH_LOCATION_MANAGER (user_data); + self->connection = connection; g_dbus_interface_skeleton_export (G_DBUS_INTERFACE_SKELETON (self), - connection, + self->connection, LOCATION_AGENT_DBUS_PATH, NULL); update_accuracy_level (self, self->enabled); @@ -454,6 +454,7 @@ phosh_location_manager_dispose (GObject *object) g_clear_object (&self->location_settings); g_clear_object (&self->manager_proxy); + g_clear_object (&self->connection); G_OBJECT_CLASS (phosh_location_manager_parent_class)->dispose (object); } -- GitLab From 3eb64c47c3ae26693c6bcbe9490c6a1a69b54328 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Guido=20G=C3=BCnther?= Date: Fri, 26 Sep 2025 17:17:42 +0200 Subject: [PATCH 06/15] wwan-mm: Avoid cast MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This gives us more type safety Signed-off-by: Guido Günther Part-of: --- src/wwan/phosh-wwan-mm.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/wwan/phosh-wwan-mm.c b/src/wwan/phosh-wwan-mm.c index dfd9d78dd..b97a68194 100644 --- a/src/wwan/phosh-wwan-mm.c +++ b/src/wwan/phosh-wwan-mm.c @@ -748,8 +748,9 @@ phosh_wwan_mm_interface_init (PhoshWWanInterface *iface) static void -on_bus_get_ready (GObject *source_object, GAsyncResult *res, PhoshWWanMM *self) +on_bus_get_ready (GObject *source_object, GAsyncResult *res, gpointer user_data) { + PhoshWWanMM *self = PHOSH_WWAN_MM (user_data); g_autoptr (GError) err = NULL; GDBusConnection *connection; @@ -774,7 +775,7 @@ phosh_wwan_mm_init (PhoshWWanMM *self) g_bus_get (G_BUS_TYPE_SYSTEM, self->cancel, - (GAsyncReadyCallback)on_bus_get_ready, + on_bus_get_ready, self); } -- GitLab From 149f8108ecc9ae3094a430be51813be33b334e20 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Guido=20G=C3=BCnther?= Date: Fri, 26 Sep 2025 17:19:00 +0200 Subject: [PATCH 07/15] wwan-mm: Avoid cast MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This gives us more type safety Signed-off-by: Guido Günther Part-of: --- src/wwan/phosh-wwan-mm.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/wwan/phosh-wwan-mm.c b/src/wwan/phosh-wwan-mm.c index b97a68194..ec2ea7c7b 100644 --- a/src/wwan/phosh-wwan-mm.c +++ b/src/wwan/phosh-wwan-mm.c @@ -559,8 +559,9 @@ on_mm_object_removed (PhoshWWanMM *self, GDBusObject *object, MMManager *manager static void -on_mm_manager_ready (GObject *source_object, GAsyncResult *res, PhoshWWanMM *self) +on_mm_manager_ready (GObject *source_object, GAsyncResult *res, gpointer user_data) { + PhoshWWanMM *self = PHOSH_WWAN_MM (user_data); g_autoptr (GError) err = NULL; g_autolist (GDBusObject) modems = NULL; MMManager *manager; @@ -763,7 +764,7 @@ on_bus_get_ready (GObject *source_object, GAsyncResult *res, gpointer user_data) mm_manager_new (connection, G_DBUS_OBJECT_MANAGER_CLIENT_FLAGS_DO_NOT_AUTO_START, self->cancel, - (GAsyncReadyCallback)on_mm_manager_ready, + on_mm_manager_ready, self); } -- GitLab From ca371fccad389d18dccad14155112cd4f5d099cf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Guido=20G=C3=BCnther?= Date: Fri, 26 Sep 2025 17:20:16 +0200 Subject: [PATCH 08/15] wwan-mm: Dispose connection on shutdown MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Guido Günther Part-of: --- src/wwan/phosh-wwan-mm.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/wwan/phosh-wwan-mm.c b/src/wwan/phosh-wwan-mm.c index ec2ea7c7b..ac9b5ab91 100644 --- a/src/wwan/phosh-wwan-mm.c +++ b/src/wwan/phosh-wwan-mm.c @@ -51,6 +51,7 @@ typedef struct _PhoshWWanMM { MMManager *manager; GCancellable *cancel; + GDBusConnection *connection; guint signal_quality; const char *access_tec; @@ -609,6 +610,8 @@ phosh_wwan_mm_dispose (GObject *object) g_clear_object (&self->manager); } + g_clear_object (&self->connection); + G_OBJECT_CLASS (phosh_wwan_mm_parent_class)->dispose (object); } @@ -761,7 +764,8 @@ on_bus_get_ready (GObject *source_object, GAsyncResult *res, gpointer user_data) return; } - mm_manager_new (connection, + self->connection = connection; + mm_manager_new (self->connection, G_DBUS_OBJECT_MANAGER_CLIENT_FLAGS_DO_NOT_AUTO_START, self->cancel, on_mm_manager_ready, -- GitLab From a9860428592d068b2d21ddd195b2ac93a2290a4f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Guido=20G=C3=BCnther?= Date: Fri, 26 Sep 2025 17:19:00 +0200 Subject: [PATCH 09/15] monitor-manager: Avoid cast MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This gives us more type safety Signed-off-by: Guido Günther Part-of: --- src/monitor-manager.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/monitor-manager.c b/src/monitor-manager.c index 920b4cf0c..0a3a97dac 100644 --- a/src/monitor-manager.c +++ b/src/monitor-manager.c @@ -1262,10 +1262,12 @@ on_gsd_color_temperature_changed (PhoshMonitorManager*self, static void -on_gsd_color_proxy_new_for_bus_finish (GObject *source_object, - GAsyncResult *res, - PhoshMonitorManager *self) +on_gsd_color_proxy_new_for_bus_finish (GObject *source_object, + GAsyncResult *res, + gpointer user_data) + { + PhoshMonitorManager *self = PHOSH_MONITOR_MANAGER (user_data); g_autoptr (GError) err = NULL; PhoshDBusColor *proxy; @@ -1306,7 +1308,7 @@ on_idle (PhoshMonitorManager *self) GSD_COLOR_BUS_NAME, GSD_COLOR_OBJECT_PATH, self->cancel, - (GAsyncReadyCallback) on_gsd_color_proxy_new_for_bus_finish, + on_gsd_color_proxy_new_for_bus_finish, self); return FALSE; -- GitLab From 3e260562d004d5430a74aeeb89b6f8bc64ff8668 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Guido=20G=C3=BCnther?= Date: Fri, 26 Sep 2025 19:35:49 +0200 Subject: [PATCH 10/15] tests: Make sure gvfs doesn't spawn in tests MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit We don't want it to take any DBus connection that could block GTestDBus shutdown. Signed-off-by: Guido Günther Part-of: --- tests/meson.build | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tests/meson.build b/tests/meson.build index 3bdb19d7b..43b6702a7 100644 --- a/tests/meson.build +++ b/tests/meson.build @@ -29,6 +29,8 @@ test_env_common.set('MALLOC_CHECK_', '2') test_env_common.set('NO_AT_BRIDGE', '1') # For GTK4 apps running in the tests: test_env_common.set('GTK_A11Y', 'none') +# Make sure gvfs doesn't linger around +test_env_common.set('GIO_USE_VFS', 'local') # For -Db_sanitize=address test_env_common.set( -- GitLab From 9bbedc6f7b8f6a2b84477bce405468ae8a07ec04 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Guido=20G=C3=BCnther?= Date: Fri, 26 Sep 2025 20:07:57 +0200 Subject: [PATCH 11/15] util: Improve phosh_dbus_service_error_warn() MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit We usually want to special case "cancelled" and "doesn't exist" in the tests. Signed-off-by: Guido Günther Part-of: --- src/util.c | 31 +++++++++++++++++++++++++++++++ src/util.h | 13 +++++++++++-- 2 files changed, 42 insertions(+), 2 deletions(-) diff --git a/src/util.c b/src/util.c index f154f941d..c753b66af 100644 --- a/src/util.c +++ b/src/util.c @@ -242,6 +242,37 @@ phosh_error_warnv (const char *log_domain, } +gboolean +phosh_error_warnv2 (const char *log_domain, + GError *err, + GQuark domain, + int code1, + int code2, + const char *fmt, ...) +{ + g_autofree char *msg = NULL; + gboolean matched = FALSE; + va_list args; + + if (err == NULL) + return FALSE; + + va_start (args, fmt); + msg = g_strdup_vprintf(fmt, args); + va_end (args); + + if (g_error_matches (err, domain, code1) || + g_error_matches (err, domain, code2)) + matched = TRUE; + + g_log (log_domain, + matched ? G_LOG_LEVEL_DEBUG : G_LOG_LEVEL_WARNING, + "%s: %s", msg, err->message); + + return matched; +} + + static void randname (char *buf) { diff --git a/src/util.h b/src/util.h index 4f52e32e4..09f52a29f 100644 --- a/src/util.h +++ b/src/util.h @@ -14,8 +14,10 @@ #define phosh_async_error_warn(err, ...) \ phosh_error_warnv (G_LOG_DOMAIN, err, G_IO_ERROR, G_IO_ERROR_CANCELLED, __VA_ARGS__) -#define phosh_dbus_service_error_warn(err, ...) \ - phosh_error_warnv (G_LOG_DOMAIN, err, G_IO_ERROR, G_IO_ERROR_NOT_FOUND, __VA_ARGS__) +#define phosh_dbus_service_error_warn(err, ...) \ + phosh_error_warnv2 (G_LOG_DOMAIN, err, G_IO_ERROR, \ + G_IO_ERROR_NOT_FOUND, G_IO_ERROR_CANCELLED, \ + __VA_ARGS__) void phosh_cp_widget_destroy (void *widget); GDesktopAppInfo *phosh_get_desktop_app_info_for_app_id (const char *app_id); @@ -28,6 +30,13 @@ gboolean phosh_error_warnv (const char *log_domain, int code, const char *fmt, ...) G_GNUC_PRINTF(5, 6); +gboolean phosh_error_warnv2 (const char *log_domain, + GError *err, + GQuark domain, + int code1, + int code2, + const gchar *fmt, + ...) G_GNUC_PRINTF(6, 7); int phosh_create_shm_file (off_t size); char *phosh_util_escape_markup (const char *markup, gboolean allow_markup); gboolean phosh_util_gesture_is_touch (GtkGestureSingle *gesture); -- GitLab From d4066a1c6071c4ee338c7a93e5a320d412657dd0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Guido=20G=C3=BCnther?= Date: Fri, 26 Sep 2025 20:33:51 +0200 Subject: [PATCH 12/15] feedback-manager: Ignore service unknown errors MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit These can happen in tests Signed-off-by: Guido Günther Part-of: --- src/feedback-manager.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/feedback-manager.c b/src/feedback-manager.c index 0d7030341..5b88f4792 100644 --- a/src/feedback-manager.c +++ b/src/feedback-manager.c @@ -12,6 +12,7 @@ #include "feedback-manager.h" #include "shell-priv.h" +#include "util.h" #include @@ -58,8 +59,12 @@ on_event_triggered (LfbEvent *event, g_autoptr (GError) err = NULL; if (!lfb_event_trigger_feedback_finish (event, res, &err)) { - g_warning_once ("Failed to trigger feedback for '%s': %s", - lfb_event_get_event (event), err->message); + if (g_error_matches (err, G_DBUS_ERROR, G_DBUS_ERROR_SERVICE_UNKNOWN)) { + g_debug ("Feedbackd service not found: %s", err->message); + } else { + g_warning ("Failed to trigger feedback for '%s': %s", + lfb_event_get_event (event), err->message); + } } } -- GitLab From 2b098f8dd1fa16c239f3c337ff1a97b439e8f27f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Guido=20G=C3=BCnther?= Date: Fri, 26 Sep 2025 22:19:16 +0200 Subject: [PATCH 13/15] tests: Set XDG_CURRENT_DESKTOP MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This ensures we pick up Phosh's gsettings defaults Signed-off-by: Guido Günther Part-of: --- tests/meson.build | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tests/meson.build b/tests/meson.build index 43b6702a7..b21909920 100644 --- a/tests/meson.build +++ b/tests/meson.build @@ -24,6 +24,8 @@ test_env_common.set( 'GSETTINGS_SCHEMA_DIR', '@0@/data:@1@'.format(meson.project_build_root(), plugin_schema_path), ) +# Make sure we use Phosh's gsetting prefs +test_env_common.set('XDG_CURRENT_DESKTOP', 'Phosh:GNOME') test_env_common.set('PYTHONDONTWRITEBYTECODE', 'yes') test_env_common.set('MALLOC_CHECK_', '2') test_env_common.set('NO_AT_BRIDGE', '1') -- GitLab From 39de26fca5e335d1ff7de324e5a93e64665005aa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Guido=20G=C3=BCnther?= Date: Fri, 26 Sep 2025 22:34:03 +0200 Subject: [PATCH 14/15] ci: Udpate image MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Let's update to Trixie before we switch to Forky soon. Signed-off-by: Guido Günther Part-of: --- .gitlab-ci.yml | 2 +- .gitlab-ci/asan.Dockerfile | 2 +- .gitlab-ci/screenshot.Dockerfile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b86c6d8ce..3e32d9c9f 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -43,7 +43,7 @@ variables: # For ci-fairy FDO_UPSTREAM_REPO: World/Phosh/phosh # screenshot and asan builds on DEBIAN_IMAGE so keep them in sync - IMAGE_VERSION: v0.0.2025-06-16.2 + IMAGE_VERSION: v0.0.2025-09-27 DEBIAN_IMAGE: $CI_REGISTRY/world/phosh/phosh/debian:$IMAGE_VERSION SCREENSHOT_IMAGE: $CI_REGISTRY/world/phosh/phosh/screenshot:$IMAGE_VERSION ASAN_IMAGE: $CI_REGISTRY/world/phosh/phosh/asan:$IMAGE_VERSION diff --git a/.gitlab-ci/asan.Dockerfile b/.gitlab-ci/asan.Dockerfile index 7025c2923..4f7a7230a 100644 --- a/.gitlab-ci/asan.Dockerfile +++ b/.gitlab-ci/asan.Dockerfile @@ -1,4 +1,4 @@ -FROM registry.gitlab.gnome.org/world/phosh/phosh/debian:v0.0.2025-06-16.2 +FROM registry.gitlab.gnome.org/world/phosh/phosh/debian:v0.0.2025-09-27 RUN export DEBIAN_FRONTEND=noninteractive \ && apt-get -y update \ diff --git a/.gitlab-ci/screenshot.Dockerfile b/.gitlab-ci/screenshot.Dockerfile index 1ac42ef28..9274f2078 100644 --- a/.gitlab-ci/screenshot.Dockerfile +++ b/.gitlab-ci/screenshot.Dockerfile @@ -1,4 +1,4 @@ -FROM registry.gitlab.gnome.org/world/phosh/phosh/debian:v0.0.2025-06-16.2 +FROM registry.gitlab.gnome.org/world/phosh/phosh/debian:v0.0.2025-09-27 RUN export DEBIAN_FRONTEND=noninteractive \ && apt-get -y update \ -- GitLab From c7537579eca02e2960393fbef3386eda3c06155e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Guido=20G=C3=BCnther?= Date: Fri, 26 Sep 2025 22:51:57 +0200 Subject: [PATCH 15/15] ci: Shuffle dockerfile a bit MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Update everything first rather than in between. The removal of the comment ensures we actuall get the build-deps installed again thus speeing up the build. Signed-off-by: Guido Günther Part-of: --- .gitlab-ci/debian.Dockerfile | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/.gitlab-ci/debian.Dockerfile b/.gitlab-ci/debian.Dockerfile index 50762c9d7..80a6d26e7 100644 --- a/.gitlab-ci/debian.Dockerfile +++ b/.gitlab-ci/debian.Dockerfile @@ -1,15 +1,13 @@ - FROM debian:trixie-slim RUN export DEBIAN_FRONTEND=noninteractive \ && apt-get -y update \ - && apt-get -y install --no-install-recommends wget ca-certificates gnupg eatmydata \ - && eatmydata apt-get --no-install-recommends -y install build-essential git wget gcovr locales uncrustify abi-compliance-checker abi-dumper universal-ctags \ - && eatmydata apt-get -y install clang clang-tools lld # For clang build \ - && eatmydata apt-get -y update \ + && apt-get -y install --no-install-recommends eatmydata \ && eatmydata apt-get -y dist-upgrade \ + && apt-get -y install --no-install-recommends wget ca-certificates gnupg \ + && eatmydata apt-get --no-install-recommends -y install build-essential git wget gcovr locales uncrustify abi-compliance-checker abi-dumper universal-ctags \ + && eatmydata apt-get -y install clang clang-tools lld \ && cd /home/user/app \ - && eatmydata apt-get -y update \ && eatmydata apt-get --no-install-recommends -y build-dep . \ && eatmydata apt-get clean -- GitLab