From 53f20a2ce69b4ce63fa28f105dbb58707d6340df Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Sun, 15 Oct 2023 22:12:54 +0530 Subject: [PATCH] Set OPENSSL_MODULES on CI --- setup/unix-ci.py | 2 ++ setup/win-ci.py | 1 + 2 files changed, 3 insertions(+) diff --git a/setup/unix-ci.py b/setup/unix-ci.py index 46e8afd7cc..e3acaeeb6d 100644 --- a/setup/unix-ci.py +++ b/setup/unix-ci.py @@ -158,11 +158,13 @@ username = api run(sys.executable, 'setup.py', 'pot') elif action == 'test': os.environ['CI'] = 'true' + os.environ['OPENSSL_MODULES'] = os.path.join(SW, 'lib', 'ossl-modules') if ismacos: os.environ['SSL_CERT_FILE'] = os.path.abspath( 'resources/mozilla-ca-certs.pem') # needed to ensure correct libxml2 is loaded os.environ['DYLD_INSERT_LIBRARIES'] = ':'.join(os.path.join(SW, 'lib', x) for x in 'libxml2.dylib libxslt.dylib libexslt.dylib'.split()) + os.environ['OPENSSL_ENGINES'] = os.path.join(SW, 'lib', 'engines-3') install_env() run_python('setup.py test') diff --git a/setup/win-ci.py b/setup/win-ci.py index c6dbf190ed..ecf014a648 100644 --- a/setup/win-ci.py +++ b/setup/win-ci.py @@ -84,6 +84,7 @@ def setup_env(): os.environ['QMAKE'] = os.path.join(SW, r'qt\bin\qmake') os.environ['CALIBRE_QT_PREFIX'] = os.path.join(SW, r'qt') os.environ['CI'] = 'true' + os.environ['OPENSSL_MODULES'] = os.path.join(SW, 'lib', 'ossl-modules') def main():