Hello, here's patch split into 3 patches.
вт, 11 февр. 2020 г. в 12:17, Willy Tarreau <[email protected]>: > On Tue, Feb 11, 2020 at 12:14:47PM +0500, ???? ??????? wrote: > > I will send patch series soon. > Thank you! > willy >
From e47087ecaea0aa32475593afbf460dc0cf72c1f9 Mon Sep 17 00:00:00 2001 From: Ilya Shipitsin <[email protected]> Date: Tue, 11 Feb 2020 13:20:32 +0500 Subject: [PATCH 3/3] cirrus-ci: add ERR=1 to freebsd builds --- .cirrus.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.cirrus.yml b/.cirrus.yml index 5c7c8403d..1a07c80c7 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -10,7 +10,7 @@ FreeBSD_task: 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
From 6d44d41d01fe150316b9ae9e7ba296464ad45393 Mon Sep 17 00:00:00 2001 From: Ilya Shipitsin <[email protected]> Date: Tue, 11 Feb 2020 13:19:22 +0500 Subject: [PATCH 2/3] 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. --- .cirrus.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.cirrus.yml b/.cirrus.yml index d52808358..5c7c8403d 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -6,7 +6,7 @@ FreeBSD_task: image_family: freebsd-11-3-snap only_if: $CIRRUS_BRANCH =~ 'master|next' install_script: - - pkg install -y openssl 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 -- 2.24.1
From 84a013d8f6c1dfe4977e2d5c21887c4ede3230ae Mon Sep 17 00:00:00 2001 From: Ilya Shipitsin <[email protected]> Date: Tue, 11 Feb 2020 13:16:02 +0500 Subject: [PATCH 1/3] cirrus-ci: switch to "snap" images to unify openssl naming "snap" images are updated frequently, while regular images are updated quarterly. so, mixing "snap" and regular images lead to package naming mismatch, which will occur every quarter. we cannot use 11.3 release image, it is broken, so we have to use 11.3 "snap" image. Thus let us use all "snap" images. 13-snap is first introduced with this commit. --- .cirrus.yml | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/.cirrus.yml b/.cirrus.yml index 4143e687b..d52808358 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -1,17 +1,12 @@ 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 install -y openssl git gmake lua53 socat script: - git clone https://github.com/VTest/VTest.git ../vtest - make -C ../vtest -- 2.24.1
