diff --git a/.cirrus.yml b/.cirrus.yml index 4ba410ee8b..e4169f1a09 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -523,7 +523,7 @@ freebsd14_task: freebsd13_task: freebsd_instance: # FreeBSD 13 EOL: January 31, 2026 - image_family: freebsd-13-4 + image_family: freebsd-13-5 << : *FREEBSD_RESOURCES_TEMPLATE prepare_script: ./ci/freebsd/prepare.sh diff --git a/CHANGES b/CHANGES index 01b36be179..a9d0ddc688 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,15 @@ +8.1.0-dev.662 | 2025-10-10 12:52:02 +0200 + + * Bump CI to freebsd-13.5 (Benjamin Bannier, Corelight) + + * Use package `cmake-core` instead of `cmake` on FreeBSD (Benjamin Bannier, Corelight) + + The package `cmake` seems to have unreliable availability on e.g., + freebsd-13. Switch to the `cmake-core` subpackage which already has all + the functionality we need. + + * Update doc submodule [nomail] [skip ci] (zeek-bot) + 8.1.0-dev.658 | 2025-10-09 20:17:21 +0200 * Type: Cache tag into TypeDecl (Arne Welzel, Corelight) diff --git a/VERSION b/VERSION index 656e3517ab..0e195a8f76 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -8.1.0-dev.658 +8.1.0-dev.662 diff --git a/ci/freebsd/prepare.sh b/ci/freebsd/prepare.sh index 9f3041e6b5..eecca1378b 100755 --- a/ci/freebsd/prepare.sh +++ b/ci/freebsd/prepare.sh @@ -6,7 +6,7 @@ set -e set -x env ASSUME_ALWAYS_YES=YES pkg bootstrap -pkg install -y bash cppzmq git cmake swig bison python3 base64 flex ccache jq dnsmasq krb5 +pkg install -y bash cppzmq git cmake-core swig bison python3 base64 flex ccache jq dnsmasq krb5 pkg upgrade -y curl pyver=$(python3 -c 'import sys; print(f"py{sys.version_info[0]}{sys.version_info[1]}")') pkg install -y $pyver-sqlite3