From 3e042e093bc09afd274d515130ae069bbb6652da Mon Sep 17 00:00:00 2001
From: Ilya Shipitsin <chipitsine@gmail.com>
Date: Sat, 10 Nov 2018 12:32:21 +0500
Subject: [PATCH] travis-ci: add libressl build, make builds parallel, remove
 not needed brew

---
 .ci/build-libressl.sh | 23 +++++++++++++++++++++++
 .ci/build-openssl.sh  |  3 ++-
 .travis.yml           | 12 +++++++-----
 3 files changed, 32 insertions(+), 6 deletions(-)
 create mode 100755 .ci/build-libressl.sh

diff --git a/.ci/build-libressl.sh b/.ci/build-libressl.sh
new file mode 100755
index 00000000..dc151b2e
--- /dev/null
+++ b/.ci/build-libressl.sh
@@ -0,0 +1,23 @@
+#!/bin/bash
+set -eux
+
+download_libressl () {
+    if [[ ! -f "download-cache/librenssl-${LIBRESSL_VERSION}.tar.gz" ]]; then
+        wget -P download-cache/ \
+            "https://ftp.openbsd.org/pub/OpenBSD/LibreSSL/libressl-${LIBRESSL_VERSION}.tar.gz"
+    fi
+}
+
+build_libressl () {
+    if [[ "$(cat ${OPENSSL_INSTALL_DIR}/.openssl-version)" != "${LIBRESSL_VERSION}" ]]; then
+        tar zxf "download-cache/libressl-${LIBRESSL_VERSION}.tar.gz"
+        cd "libressl-${LIBRESSL_VERSION}/"
+        ./configure --prefix="${OPENSSL_INSTALL_DIR}"
+        make -j $(nproc || sysctl -n hw.ncpu || echo 4) all
+        make  install
+        echo "${LIBRESSL_VERSION}" > "${OPENSSL_INSTALL_DIR}/.openssl-version"
+    fi
+}
+
+download_libressl
+build_libressl
diff --git a/.ci/build-openssl.sh b/.ci/build-openssl.sh
index f9a42e30..e52943df 100755
--- a/.ci/build-openssl.sh
+++ b/.ci/build-openssl.sh
@@ -13,7 +13,8 @@ build_openssl () {
         tar zxf "download-cache/openssl-${OPENSSL_VERSION}.tar.gz"
         cd "openssl-${OPENSSL_VERSION}/"
         ./config shared --prefix="${OPENSSL_INSTALL_DIR}" --openssldir="${OPENSSL_INSTALL_DIR}" -DPURIFY
-        make all install_sw
+        make -j $(nproc || sysctl -n hw.ncpu || echo 4) all
+        make install_sw
         echo "${OPENSSL_VERSION}" > "${OPENSSL_INSTALL_DIR}/.openssl-version"
     fi
 }
diff --git a/.travis.yml b/.travis.yml
index db69d30e..04d44caa 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -20,6 +20,11 @@ matrix:
     - env: OPENSSL_VERSION="1.1.0f"
       os: linux
       compiler: clang
+    - env: LIBRESSL_VERSION="2.8.2"
+      os: linux
+      compiler: gcc
+      before_install:
+        - bash .ci/build-libressl.sh > build-deps.log 2>&1 || (cat build-deps.log && exit 1)
     - env: LABEL="check stb files"
       os: linux
       language: csharp
@@ -50,11 +55,8 @@ matrix:
         - true
     - os: osx
       compiler: clang
-      cache:
-        directories:
-        - ${HOME}/Library/Caches/Homebrew
       before_install:
-        - brew update
+        - true
       script:
         - ./configure
         - make -C tmp
@@ -78,7 +80,7 @@ script:
   - export CFLAGS="-I${HOME}/opt/include"
   - export LDFLAGS="-L${HOME}/opt/lib"
   - ./configure
-  - make -C tmp
+  - make -j $(nproc || sysctl -n hw.ncpu || echo 4) -C tmp
   - ldd build/vpnserver
   - if [ "${BUILD_DEB}" = "1" ]; then make package -C tmp; fi
   - .ci/memory-leak-test.sh