Skip to content

Commit 01ce631

Browse files
committed
fix: ubuntu
1 parent 2fa2e9d commit 01ce631

File tree

3 files changed

+21
-16
lines changed

3 files changed

+21
-16
lines changed

.github/workflows/quality-gate.yml

+9-9
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,12 @@ jobs:
1212
strategy:
1313
matrix:
1414
include:
15-
- os: "linux"
16-
name: "amd64"
17-
runs-on: "ubuntu-18-04"
1815
# - os: "linux"
1916
# name: "amd64"
20-
# runs-on: "ubuntu-latest"
17+
# runs-on: "ubuntu-18-04"
18+
- os: "linux"
19+
name: "amd64"
20+
runs-on: "ubuntu-latest"
2121
- os: "mac"
2222
name: "arm64"
2323
runs-on: "mac-silicon"
@@ -36,11 +36,11 @@ jobs:
3636
id: checkout
3737
uses: actions/checkout@v3
3838

39-
- name: Install OpenSSL on Ubuntu
40-
if: matrix.os == 'linux'
41-
run: |
42-
sudo apt-get update
43-
sudo apt-get install -y openssl libssl-dev
39+
# - name: Install OpenSSL on Ubuntu
40+
# if: matrix.os == 'linux'
41+
# run: |
42+
# sudo apt-get update
43+
# sudo apt-get install -y openssl libssl-dev
4444

4545
- name: Install make on Windows
4646
if: runner.os == 'windows'

Makefile

-6
Original file line numberDiff line numberDiff line change
@@ -27,12 +27,6 @@ endif
2727
build-example-server:
2828
ifeq ($(OS),Windows_NT)
2929
@powershell -Command "mkdir -p .\examples\server\build\engines\cortex.python; cd .\examples\server\build; cmake .. $(CMAKE_EXTRA_FLAGS); cmake --build . --config Release; cp -r ..\..\..\build\python .\Release\engines\cortex.python\python"
30-
else ifeq ($(shell uname -s),Linux)
31-
@mkdir -p examples/server/build/engines/cortex.python; \
32-
cd examples/server/build; \
33-
cmake ..; \
34-
cmake --build . --config Release -j12; \
35-
cp -r build/python examples/server/build/engines/cortex.python;
3630
else
3731
@mkdir -p examples/server/build/engines/cortex.python; \
3832
cp -rf build_deps/_install/lib/engines-3 build/python/; \

third-party/CMakeLists.txt

+12-1
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,17 @@ if(APPLE)
9292
endif()
9393

9494
if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
95+
# Download and install OpenSSL
96+
ExternalProject_Add(
97+
OpenSSL
98+
URL https://www.openssl.org/source/openssl-3.3.0.tar.gz
99+
PREFIX ${THIRD_PARTY_INSTALL_PATH}
100+
CONFIGURE_COMMAND ./Configure --prefix=<INSTALL_DIR>
101+
BUILD_COMMAND make -j8
102+
INSTALL_COMMAND make install
103+
BUILD_IN_SOURCE 1
104+
)
105+
95106
# Download and install zlib
96107
ExternalProject_Add(
97108
zlib
@@ -139,7 +150,7 @@ if (UNIX) # APPLE and LINUX
139150
else()
140151
set(PYTHON_INSTALL_CONFIG_HOST "")
141152
set(PYTHON_INSTALL_CONFIG_BUILD "")
142-
set(PYTHON_INSTALL_CONFIG_SSL "")
153+
set(PYTHON_INSTALL_CONFIG_SSL "--with-openssl=${THIRD_PARTY_INSTALL_PATH} --with-openssl-rpath=auto")
143154
endif()
144155

145156
# Download and install Python3 from source

0 commit comments

Comments
 (0)