Merge pull request #1054 from metalefty/freebsd-ci

Merge pull request #1054: Further FreeBSD CI refinements

.cirrus.yml

@@ -1,30 +1,28 @@
 FreeBSD_task:
-  freebsd_instance:
+  matrix:
-    image: freebsd-12-1-release-amd64
+    env:
-  env:
+      SSL: openssl
-    ASSUME_ALWAYS_YES: TRUE # required for unattanded "pkg" invocation
+    env:
-  install_script:
+      SSL: openssl111
-    - pkg install cmake openssl111 git
+    env:
+      SSL: libressl
+    env:
+      SSL: libressl-devel
+    env:
+      SSL:
+  matrix:
+    freebsd_instance:
+      image_family: freebsd-12-1
+    freebsd_instance:
+      image_family: freebsd-11-3-snap
+  prepare_script:
+    - pkg install -y cmake git $SSL
     - git submodule update --init --recursive
-  script:
+  configure_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
+  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