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 88cb84f22653576ddbda97d406823f263c5b9ce9..2aaed0cf009d7fc14fd95bd4068edf877b0e010b 100644 (file)
--- 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 46f0b7ebfaeed0efa30eed49f1b9d52a08f936cf..4b100a7ac55053ca97f9028b9a99106004e5f5cb 100644 (file)
--- 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