Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

fix: using ubuntu 18.04 #18

Merged
merged 2 commits into from
May 23, 2024
Merged

fix: using ubuntu 18.04 #18

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
db89db6
fix: build ubuntu 18.04
sangjanai May 23, 2024
c30d79d
chore: change to ubuntu 18.04 for push event
sangjanai May 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,12 +56,12 @@ jobs:
strategy:
matrix:
include:
# - os: "linux"
# name: "amd64"
# runs-on: "ubuntu-18-04"
- os: "linux"
name: "amd64"
runs-on: "ubuntu-latest"
runs-on: "ubuntu-18-04"
# - os: "linux"
# name: "amd64"
# runs-on: "ubuntu-latest"
- os: "mac"
name: "arm64"
runs-on: "mac-silicon"
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/quality-gate.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,12 @@ jobs:
strategy:
matrix:
include:
# - os: "linux"
# name: "amd64"
# runs-on: "ubuntu-18-04"
- os: "linux"
name: "amd64"
runs-on: "ubuntu-latest"
runs-on: "ubuntu-18-04"
# - os: "linux"
# name: "amd64"
# runs-on: "ubuntu-latest"
- os: "mac"
name: "arm64"
runs-on: "mac-silicon"
Expand Down
5 changes: 1 addition & 4 deletions third-party/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,6 @@ set(THIRD_PARTY_INSTALL_PATH ${CMAKE_CURRENT_SOURCE_DIR}/../build_deps/_install)
if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC")
add_compile_options(-fPIC)

set(CMAKE_INSTALL_RPATH "${THIRD_PARTY_INSTALL_PATH}")
set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
endif()

ExternalProject_Add(
Expand Down Expand Up @@ -158,7 +155,7 @@ if (UNIX) # APPLE and LINUX
Python3
URL https://www.python.org/ftp/python/3.10.4/Python-3.10.4.tgz
PREFIX ${THIRD_PARTY_INSTALL_PATH}
CONFIGURE_COMMAND ./configure --prefix=<INSTALL_DIR> --enable-optimizations --with-ensurepip=install --enable-shared ${PYTHON_INSTALL_CONFIG_HOST} ${PYTHON_INSTALL_CONFIG_BUILD} ${PYTHON_INSTALL_CONFIG_SSL}
CONFIGURE_COMMAND ${CMAKE_COMMAND} -E env LD_LIBRARY_PATH=${THIRD_PARTY_INSTALL_PATH}/lib:${LD_LIBRARY_PATH} ./configure --prefix=<INSTALL_DIR> --enable-optimizations --with-ensurepip=install --enable-shared ${PYTHON_INSTALL_CONFIG_HOST} ${PYTHON_INSTALL_CONFIG_BUILD} ${PYTHON_INSTALL_CONFIG_SSL}
BUILD_COMMAND make -j12
INSTALL_COMMAND make install
BUILD_IN_SOURCE 1
Expand Down
Loading