diff --git a/CHANGES b/CHANGES index 6b79bc266f..076543673e 100644 --- a/CHANGES +++ b/CHANGES @@ -1,4 +1,8 @@ +3.1.0-dev.350 | 2020-01-06 10:51:07 -0800 + + * Fix Cirrus CI FreeBSD python dependencies installation (Jon Siwek, Corelight) + 3.1.0-dev.348 | 2020-01-06 11:19:36 -0700 * Increase timeout for a btest diff --git a/VERSION b/VERSION index 9639147d94..c26bf128f7 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -3.1.0-dev.348 +3.1.0-dev.350 diff --git a/ci/freebsd/prepare.sh b/ci/freebsd/prepare.sh index 5ff6f59833..cf5f888998 100755 --- a/ci/freebsd/prepare.sh +++ b/ci/freebsd/prepare.sh @@ -6,6 +6,8 @@ set -e set -x env ASSUME_ALWAYS_YES=YES pkg bootstrap -pkg install -y bash git cmake swig30 bison python3 py36-sqlite3 py36-pip base64 +pkg install -y bash git cmake swig30 bison python3 base64 +pyver=`python3 -c 'import sys; print(f"py{sys.version_info[0]}{sys.version_info[1]}")'` +pkg install -y $pyver-sqlite3 $pyver-pip ( cd && mkdir -p ./bin && ln -s /usr/local/bin/python3 ./bin/python ) pip install junit2html