Merge pull request #153 from jaspervdm/link_openssl_v2

Use vendored nativetls

.before-deploy.sh

@@ -0,0 +1,24 @@
+#!/bin/bash
+
+case "${TRAVIS_OS_NAME}" in
+    "linux")
+        wget https://www.openssl.org/source/openssl-1.1.0j.tar.gz
+        tar -xf openssl-1.1.0j.tar.gz
+        cd openssl-1.1.0j
+        ./config
+        make
+        cd ..
+        cargo clean && \
+        OPENSSL_LIB_DIR=./openssl-1.1.0 OPENSSL_INCLUDE_DIR=./openssl-1.1.0/include cargo build --release && \
+        ./.auto-release.sh
+        ;;
+    "osx")
+        brew update
+        cargo clean && \
+        cargo build --release && \
+        ./.auto-release.sh
+        ;;
+    *)
+        printf "Error! Unknown \$TRAVIS_OS_NAME: \`%s\`" "${TRAVIS_OS_NAME}"
+        exit 1
+esac

.travis.yml

@@ -25,14 +25,8 @@ matrix:
     - os: osx
 
 before_deploy:
-  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then
-      cargo clean && OPENSSL_STATIC=1 OPENSSL_LIB_DIR=/usr/local/opt/openssl/lib OPENSSL_INCLUDE_DIR=/usr/local/opt/openssl/include cargo build --release && ./.auto-release.sh;
-    fi
-  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
-      brew update;
-      cargo clean && OPENSSL_STATIC=1 OPENSSL_LIB_DIR=/usr/local/opt/openssl/lib OPENSSL_INCLUDE_DIR=/usr/local/opt/openssl/include cargo build --release && ./.auto-release.sh;
-    fi
-
+  - ./.before-deploy.sh
+
 deploy:
   provider: releases
   api_key: "$GITHUB_OAUTH_TOKEN"

Cargo.toml

@@ -14,7 +14,7 @@ serde_json = "1.0"
 toml = "0.4"
 clap = "2"
 colored = "1.6"
-ws = { version="0.7", features=["ssl"] }
+ws = { git = "https://github.com/vault713/ws-rs", branch = "vendored", features = ["nativetls", "vendored"]}
 dirs = "1"
 futures = "0.1"
 tokio = "= 0.1.11"