From 8715e3b74d8ad5575d4719abeca73a292671a98c Mon Sep 17 00:00:00 2001 From: Dmitry Baryshkov Date: Wed, 12 Feb 2025 12:23:04 +0200 Subject: [PATCH 1/3] CI: refresh Ubuntu releases Ubuntu Mantic has been removed from the mirros, drop it from the CI workflow. At the same time add new Ubuntu Oracular release. Signed-off-by: Dmitry Baryshkov --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index df4d7a3..a5998fe 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -48,8 +48,8 @@ jobs: - fedora:38 - fedora:37 - ubuntu:latest + - ubuntu:oracular - ubuntu:noble - - ubuntu:mantic - ubuntu:jammy - ubuntu:focal # On Ubuntu Bionic the Meson doesn't support feature options From 59db2941f562fcf704bcfae920e8ef73fe0e3f8b Mon Sep 17 00:00:00 2001 From: Dmitry Baryshkov Date: Wed, 12 Feb 2025 12:30:33 +0200 Subject: [PATCH 2/3] CI: add more Fedora releases Add Fedora 41 and 42 to the list of build configurations. Signed-off-by: Dmitry Baryshkov --- .github/workflows/ci.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a5998fe..60ec5c1 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -43,6 +43,8 @@ jobs: # Fails on configure on GCC and clang (process restrictions?) # - fedora:rawhide - fedora:latest + - fedora:42 + - fedora:41 - fedora:40 - fedora:39 - fedora:38 From b0df12edc007f22f4293e62e9fa3f6ae478449e1 Mon Sep 17 00:00:00 2001 From: Dmitry Baryshkov Date: Wed, 12 Feb 2025 12:36:10 +0200 Subject: [PATCH 3/3] status: use %lld to print time_t Some build configurations are switching to 64-bit time_t, breaking builds on 32-bit architectures. Always use %lld and perform an explicit conversion to (long long int) in order to make the code compile on all architectures. ../status.c: In function 'status_send_values': ../status.c:46:53: error: format '%ld' expects argument of type 'long int', but argument 4 has type '__time64_t' {aka 'long long int'} [-Werror=format=] Signed-off-by: Dmitry Baryshkov --- status.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/status.c b/status.c index 431c04f..b2ef2eb 100644 --- a/status.c +++ b/status.c @@ -43,7 +43,8 @@ void status_send_values(const char *id, struct status_value *values) status_get_ts(&ts); - len = snprintf(buf, sizeof(buf), "{\"ts\":%ld.%03ld, \"%s\":{ ", ts.tv_sec, ts.tv_nsec / 1000000, id); + len = snprintf(buf, sizeof(buf), "{\"ts\":%lld.%03ld, \"%s\":{ ", + (long long int)ts.tv_sec, ts.tv_nsec / 1000000, id); for (value = values; value->unit; value++) { if (value != values) {