Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-11 11:08:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge branch 'topic/bbannier/ci-freebsd-13'

Browse source
This commit is contained in:
Benjamin Bannier 2025-10-10 12:52:02 +02:00
commit fed2be36fd
4 changed files with 15 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
.cirrus.yml
View file

@ -523,7 +523,7 @@ freebsd14_task:
freebsd13_task: freebsd13_task:
freebsd_instance: freebsd_instance:
# FreeBSD 13 EOL: January 31, 2026 # FreeBSD 13 EOL: January 31, 2026
image_family: freebsd-13-4 image_family: freebsd-13-5
<< : *FREEBSD_RESOURCES_TEMPLATE << : *FREEBSD_RESOURCES_TEMPLATE
prepare_script: ./ci/freebsd/prepare.sh prepare_script: ./ci/freebsd/prepare.sh

12
CHANGES
View file

@ -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 8.1.0-dev.658 | 2025-10-09 20:17:21 +0200
* Type: Cache tag into TypeDecl (Arne Welzel, Corelight) * Type: Cache tag into TypeDecl (Arne Welzel, Corelight)

2
VERSION
View file

@ -1 +1 @@
8.1.0-dev.658 8.1.0-dev.662

2
ci/freebsd/prepare.sh
View file

@ -6,7 +6,7 @@ set -e
set -x set -x
env ASSUME_ALWAYS_YES=YES pkg bootstrap 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 pkg upgrade -y curl
pyver=$(python3 -c 'import sys; print(f"py{sys.version_info[0]}{sys.version_info[1]}")') pyver=$(python3 -c 'import sys; print(f"py{sys.version_info[0]}{sys.version_info[1]}")')
pkg install -y $pyver-sqlite3 pkg install -y $pyver-sqlite3