From eccb2b4bd99e2f69a79afb8fe5a1a18636ff9742 Mon Sep 17 00:00:00 2001 From: Ilya Shipitsin Date: Tue, 11 Feb 2020 13:16:02 +0500 Subject: [PATCH] BUILD: 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