Hello, I attached a workaround to recent cirrus-ci failures. also, few improvements.
Cheers, Ilya Shipitcin
From bbefa0574b0e3b8e872422f9419a458928a433d0 Mon Sep 17 00:00:00 2001 From: Ilya Shipitsin <chipits...@gmail.com> Date: Sat, 8 Feb 2020 13:30:54 +0500 Subject: [PATCH] cirrus-ci: workaround "pkg install" bug there's a bug https://github.com/freebsd/pkg/issues/902 adding "pkg update -f && pkg upgrade -y" is workaround. also, add ERR=1 to make, also switch to "snap" images to unify openssl package naming. also, added freebsd-13 build --- .cirrus.yml | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/.cirrus.yml b/.cirrus.yml index 4143e687b..1a07c80c7 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -1,21 +1,16 @@ FreeBSD_task: freebsd_instance: matrix: - image_family: freebsd-12-1 + image_family: freebsd-13-0-snap + image_family: freebsd-12-1-snap image_family: freebsd-11-3-snap only_if: $CIRRUS_BRANCH =~ 'master|next' install_script: - - case `uname -r` in - 11.3*) - export SSL=openssl;; - 12.1*) - export SSL=openssl111;; - esac - - pkg install -y $SSL git gmake lua53 socat + - pkg update -f && pkg upgrade -y && pkg install -y openssl git gmake lua53 socat script: - git clone https://github.com/VTest/VTest.git ../vtest - make -C ../vtest - - gmake CC=clang V=1 TARGET=freebsd USE_ZLIB=1 USE_PCRE=1 USE_OPENSSL=1 USE_LUA=1 LUA_INC=/usr/local/include/lua53 LUA_LIB=/usr/local/lib LUA_LIB_NAME=lua-5.3 + - gmake CC=clang V=1 ERR=1 TARGET=freebsd USE_ZLIB=1 USE_PCRE=1 USE_OPENSSL=1 USE_LUA=1 LUA_INC=/usr/local/include/lua53 LUA_LIB=/usr/local/lib LUA_LIB_NAME=lua-5.3 - ./haproxy -vv - ldd haproxy - env VTEST_PROGRAM=../vtest/vtest gmake reg-tests || (for folder in /tmp/*regtest*/vtc.*; do cat $folder/INFO $folder/LOG; done && exit 1) -- 2.24.1
