From 9556f09166b5e61418432f76186142ca63e46eb0 Mon Sep 17 00:00:00 2001
From: Koichiro IWAO <meta@vmeta.jp>
Date: Tue, 24 Dec 2019 00:40:08 +0900
Subject: [PATCH 1/4] FreeBSD CI: use matrix to perform test

on multiple FreeBSD version and with multiple SSL libraries.
---
 .cirrus.yml | 41 ++++++++++++++++++++---------------------
 1 file changed, 20 insertions(+), 21 deletions(-)

diff --git a/.cirrus.yml b/.cirrus.yml
index e05f1c0d..c265b128 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -1,30 +1,29 @@
 FreeBSD_task:
-  freebsd_instance:
-    image: freebsd-12-1-release-amd64
+  matrix:
+    env:
+      SSL: openssl
+    env:
+      SSL: openssl111
+    env:
+      SSL: libressl
+    env:
+      SSL: libressl-devel
+  matrix:
+    freebsd_instance:
+      image: freebsd-12-1-release-amd64
+    freebsd_instance:
+      # 11-3-release doesn't boot: https://cirrus-ci.org/guide/FreeBSD/
+      image: freebsd-11-3-stable-amd64-v20191205
   env:
     ASSUME_ALWAYS_YES: TRUE # required for unattanded "pkg" invocation
-  install_script:
-    - pkg install cmake openssl111 git
+  prepare_script:
+    - pkg install cmake git $SSL
     - git submodule update --init --recursive
-  script:
-    - ./configure
-    - make -j $(sysctl -n hw.ncpu || echo 4) -C tmp
-    - ldd build/vpnserver
-    - .ci/memory-leak-test.sh
-    - .ci/vpntools-check.sh
-
-FreeBSD_task:
-  freebsd_instance:
-    # 11-3-release doesn't boot: https://cirrus-ci.org/guide/FreeBSD/
-    image: freebsd-11-3-stable-amd64-v20191205
-  env:
-    ASSUME_ALWAYS_YES: TRUE # required for unattanded "pkg" invocation
-  install_script:
-    - pkg install cmake openssl111 git
-    - git submodule update --init --recursive
-  script:
+  configure_script:
     - ./configure
+  build_script:
     - make -j $(sysctl -n hw.ncpu || echo 4) -C tmp
+  test_script:
     - ldd build/vpnserver
     - .ci/memory-leak-test.sh
     - .ci/vpntools-check.sh

From d8369043215cc3db0a4907b5a204ee0ccb33a8a0 Mon Sep 17 00:00:00 2001
From: Koichiro IWAO <meta@vmeta.jp>
Date: Tue, 24 Dec 2019 00:57:34 +0900
Subject: [PATCH 2/4] FreeBSD CI: also test with base OpenSSL

---
 .cirrus.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.cirrus.yml b/.cirrus.yml
index c265b128..958d1a86 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -8,6 +8,8 @@ FreeBSD_task:
       SSL: libressl
     env:
       SSL: libressl-devel
+    env:
+      SSL:
   matrix:
     freebsd_instance:
       image: freebsd-12-1-release-amd64

From 543a26c6a6b8eb558fe954b1d34f57a3c6d84b51 Mon Sep 17 00:00:00 2001
From: Koichiro IWAO <meta@vmeta.jp>
Date: Tue, 24 Dec 2019 08:48:16 +0900
Subject: [PATCH 3/4] FreeBSD CI: simplify image specification

and use `pkg install -y` instead of ASSUE_ALWAYS_YES=TRUE.
---
 .cirrus.yml | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/.cirrus.yml b/.cirrus.yml
index 958d1a86..4e772372 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -11,15 +11,10 @@ FreeBSD_task:
     env:
       SSL:
   matrix:
-    freebsd_instance:
-      image: freebsd-12-1-release-amd64
-    freebsd_instance:
-      # 11-3-release doesn't boot: https://cirrus-ci.org/guide/FreeBSD/
-      image: freebsd-11-3-stable-amd64-v20191205
-  env:
-    ASSUME_ALWAYS_YES: TRUE # required for unattanded "pkg" invocation
+      image_family: freebsd-12-1-release-amd64
+      image_family: freebsd-11-3-snap
   prepare_script:
-    - pkg install cmake git $SSL
+    - pkg install -y cmake git $SSL
     - git submodule update --init --recursive
   configure_script:
     - ./configure

From 6b6c0ae6368f0942253b008e277969700182cc0b Mon Sep 17 00:00:00 2001
From: Koichiro IWAO <meta@vmeta.jp>
Date: Tue, 24 Dec 2019 08:51:40 +0900
Subject: [PATCH 4/4] FreeBSD CI: `freebsd_instance` cannot be omitted

also fix image_family name.
---
 .cirrus.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.cirrus.yml b/.cirrus.yml
index 4e772372..acb95156 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -11,7 +11,9 @@ FreeBSD_task:
     env:
       SSL:
   matrix:
-      image_family: freebsd-12-1-release-amd64
+    freebsd_instance:
+      image_family: freebsd-12-1
+    freebsd_instance:
       image_family: freebsd-11-3-snap
   prepare_script:
     - pkg install -y cmake git $SSL