diff options
| author | fanquake <fanquake@gmail.com> | 2019-10-26 09:16:55 -0400 |
|---|---|---|
| committer | fanquake <fanquake@gmail.com> | 2019-11-18 08:56:48 -0500 |
| commit | 397dbae070dca9a635ff3d1d61add09db004661e (patch) | |
| tree | dfc43d14a7b19d8b23c05dc5f98a550be82144ad | |
| parent | a4eb83961965347792e9ac75928aae359d5f7405 (diff) | |
ci: remove OpenSSL installation
| -rw-r--r-- | .cirrus.yml | 2 | ||||
| -rw-r--r-- | build_msvc/vcpkg-packages.txt | 2 | ||||
| -rwxr-xr-x | ci/test/04_install.sh | 2 |
3 files changed, 2 insertions, 4 deletions
diff --git a/.cirrus.yml b/.cirrus.yml index 517cd93585..f4a3878ed8 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -16,7 +16,7 @@ task: ccache_cache: folder: "/tmp/ccache_dir" install_script: - - pkg install -y autoconf automake boost-libs git gmake libevent libtool openssl pkgconf python3 ccache + - pkg install -y autoconf automake boost-libs git gmake libevent libtool pkgconf python3 ccache - ./contrib/install_db4.sh $(pwd) - ccache --max-size=${CCACHE_SIZE} configure_script: diff --git a/build_msvc/vcpkg-packages.txt b/build_msvc/vcpkg-packages.txt index 082a13f1cf..d63636259d 100644 --- a/build_msvc/vcpkg-packages.txt +++ b/build_msvc/vcpkg-packages.txt @@ -1 +1 @@ -berkeleydb boost-filesystem boost-multi-index boost-signals2 boost-test boost-thread libevent openssl rapidcheck zeromq double-conversion
\ No newline at end of file +berkeleydb boost-filesystem boost-multi-index boost-signals2 boost-test boost-thread libevent rapidcheck zeromq double-conversion
\ No newline at end of file diff --git a/ci/test/04_install.sh b/ci/test/04_install.sh index 271ae82e5c..e70a8a9ea9 100755 --- a/ci/test/04_install.sh +++ b/ci/test/04_install.sh @@ -25,8 +25,6 @@ if [ "$TRAVIS_OS_NAME" == "osx" ]; then done export PATH="/usr/local/opt/ccache/libexec:$PATH" - OPENSSL_PKG_CONFIG_PATH="/usr/local/opt/openssl@1.1/lib/pkgconfig" - export PKG_CONFIG_PATH=$OPENSSL_PKG_CONFIG_PATH:$PKG_CONFIG_PATH ${CI_RETRY_EXE} pip3 install $PIP_PACKAGES |