From 4ee59f8950dd9ec918949df70bc206ee520e4c78 Mon Sep 17 00:00:00 2001 From: Roger Meier Date: Wed, 15 Apr 2020 00:06:20 +0200 Subject: [PATCH 1/4] chore: use openssl-sys --- Cargo.lock | 1 + Cargo.toml | 1 + 2 files changed, 2 insertions(+) diff --git a/Cargo.lock b/Cargo.lock index 0b0c8ee..2a310ad 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -385,6 +385,7 @@ dependencies = [ "junit-report 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", "openssl-probe 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", + "openssl-sys 0.9.55 (registry+https://github.com/rust-lang/crates.io-index)", "prometheus 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", "rayon 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "reqwest 0.9.24 (registry+https://github.com/rust-lang/crates.io-index)", diff --git a/Cargo.toml b/Cargo.toml index 3d00674..6a40b29 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -27,6 +27,7 @@ reqwest = "0.9" openssl-probe = "0.1" junit-report = "0.2" structopt = "0.3" +openssl-sys = "0.9.55" [profile.release] lto = true From 222afddceac5f611006afeef15b30ff112151e94 Mon Sep 17 00:00:00 2001 From: Roger Meier Date: Wed, 15 Apr 2020 00:06:43 +0200 Subject: [PATCH 2/4] chore(ci): use bionic distro within travis-ci --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 13ace73..7ddddb7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,7 @@ # Based on the "trust" template v0.1.1 # https://github.com/japaric/trust/tree/v0.1.1 -dist: trusty +dist: bionic language: rust services: docker sudo: required From 794b8b8d8c6fa3dc9bc17c8cf9a935034d618156 Mon Sep 17 00:00:00 2001 From: Roger Meier Date: Wed, 15 Apr 2020 00:08:34 +0200 Subject: [PATCH 3/4] fix(ci): remove failing freebsd from travis-ci --- .travis.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 7ddddb7..6076754 100644 --- a/.travis.yml +++ b/.travis.yml @@ -21,9 +21,6 @@ matrix: - env: TARGET=x86_64-apple-darwin os: osx - # *BSD - - env: TARGET=x86_64-unknown-freebsd DISABLE_TESTS=1 - # Testing other channels - env: TARGET=x86_64-unknown-linux-gnu rust: nightly From e2e59f5686ff813589a021a212dab4a00dd8d891 Mon Sep 17 00:00:00 2001 From: Roger Meier Date: Wed, 15 Apr 2020 15:06:03 +0200 Subject: [PATCH 4/4] chore(ci): install libssl-dev on Linux --- ci/install.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/ci/install.sh b/ci/install.sh index 748ad9a..c5f74da 100644 --- a/ci/install.sh +++ b/ci/install.sh @@ -5,6 +5,7 @@ main() { if [ $TRAVIS_OS_NAME = linux ]; then target=x86_64-unknown-linux-musl sort=sort + sudo apt-get -y install libssl-dev else target=x86_64-apple-darwin sort=gsort # for `sort --sort-version`, from brew's coreutils.