From: Simon McVittie <smcv@collabora.com>
Date: Thu, 27 Feb 2025 16:44:37 +0000 (+0000)
Subject: CI: Bump FreeBSD version to 14.2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2cc490f460d34c8c4aec83984a489bf5647289af;p=thirdparty%2Fdbus.git

CI: Bump FreeBSD version to 14.2

FreeBSD 13.1 has been EOL since July 2023, but because there are
apparently no FreeBSD users among the dbus maintainers, nobody noticed.

dbus/dbus#308 is still present in FreeBSD 14.2, so remove the version
check when skipping that particular test.

Signed-off-by: Simon McVittie <smcv@collabora.com>
---

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 88cb84f22..2aaed0cf0 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -81,8 +81,8 @@ variables:
   variables:
     BUILD_OS: freebsd
     BUILD_ARCH: "x86_64"
-    FDO_DISTRIBUTION_VERSION: '13.1'
-    FDO_DISTRIBUTION_TAG: "2025-02-27.0-$UPSTREAM_BRANCH"
+    FDO_DISTRIBUTION_VERSION: '14.2'
+    FDO_DISTRIBUTION_TAG: "2025-02-27.1-$UPSTREAM_BRANCH"
     FDO_REPO_SUFFIX: "$BUILD_OS/$BUILD_ARCH"
 
 .cmake-common:
diff --git a/test/fdpass.c b/test/fdpass.c
index 46f0b7ebf..4b100a7ac 100644
--- a/test/fdpass.c
+++ b/test/fdpass.c
@@ -772,9 +772,9 @@ test_odd_limit (Fixture *f,
 
 #ifdef __FreeBSD__
   g_test_message ("Running test on FreeBSD %d...", getosreldate ());
-  if (GPOINTER_TO_INT (data) == 0 && getosreldate () < 1400000)
+  if (GPOINTER_TO_INT (data) == 0)
     {
-      g_test_skip ("This test fails on FreeBSD < 14.0");
+      g_test_skip ("This test fails on FreeBSD");
       return;
     }
 #endif