diff options
| author | Darren Tucker <dtucker@dtucker.net> | 2021-04-27 09:18:02 +1000 |
|---|---|---|
| committer | Darren Tucker <dtucker@dtucker.net> | 2021-04-27 11:44:29 +1000 |
| commit | b3cc9fbdff2782eca79e33e02ac22450dc63bce9 (patch) | |
| tree | a212faacaa2cdd3c6c712324617bc8df57acb266 /.github | |
| parent | 77532609874a99a19e3e2eb2d1b7fa93aef963bb (diff) | |
Fix custom OpenSSL tests.
Check out specified OpenSSL version. Install custom libcrypto where
configure expects to find it. Remove unneeded OpenSSL config time
options. Older OpenSSL versions were not make -j safe so remove it.
Diffstat (limited to '.github')
| -rwxr-xr-x | .github/setup_ci.sh | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/.github/setup_ci.sh b/.github/setup_ci.sh index 1b0c8870..1918a423 100755 --- a/.github/setup_ci.sh +++ b/.github/setup_ci.sh @@ -98,9 +98,10 @@ if [ ! -z "${INSTALL_OPENSSL}" ]; then (cd ${HOME} && git clone https://github.com/openssl/openssl.git && cd ${HOME}/openssl && - ./config no-threads no-engine no-fips no-shared ${SSLCONFOPTS} \ - --prefix=/opt/openssl/head && - make -j2 && sudo make install_sw) + git checkout ${INSTALL_OPENSSL} && + ./config no-threads ${SSLCONFOPTS} \ + --prefix=/opt/openssl && + make && sudo make install_sw) fi if [ ! -z "${INSTALL_LIBRESSL}" ]; then @@ -109,6 +110,6 @@ if [ ! -z "${INSTALL_LIBRESSL}" ]; then cd ${HOME}/libressl/portable && git checkout ${INSTALL_LIBRESSL} && sh update.sh && sh autogen.sh && - ./configure --prefix=/opt/libressl/head && + ./configure --prefix=/opt/libressl && make -j2 && sudo make install) fi |