root/fileserver
1
0
Fork 0
Code Issues 16 Actions Wiki Activity

Fixed CI
Some checks failed
/ Build the server (push) Failing after 3m35s
Details

Browse Source
This commit is contained in:
Mutzi
2024-04-23 16:27:57 +02:00
parent 3b211d1af6
commit 3ab85075df
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.gitea/workflows/build.yaml
View File

@@ -8,7 +8,7 @@ jobs:
container: container:
node:current-alpine node:current-alpine
steps: steps:
- run: apk add git tar cmake make g++ linux-headers python3 xxd - run: apk add git tar cmake make g++ linux-headers python3 xxd liburing-dev
- uses: actions/checkout@v3 - uses: actions/checkout@v3
- run: npm ci - run: npm ci
working-directory: frontend working-directory: frontend

9
CMakeLists.txt
View File

@@ -17,8 +17,10 @@ set(BOOST_LIBS
function regex unordered iterator mpl conversion function_types fusion typeof functional function regex unordered iterator mpl conversion function_types fusion typeof functional
) )
set(BOOST_SUPERPROJECT_VERSION 1.85.0)
foreach(BOOST_LIB ${BOOST_LIBS}) foreach(BOOST_LIB ${BOOST_LIBS})
CPMAddPackage("gh:boostorg/${BOOST_LIB}#boost-1.85.0") CPMAddPackage("gh:boostorg/${BOOST_LIB}#boost-${BOOST_SUPERPROJECT_VERSION}")
endforeach() endforeach()
CPMAddPackage( CPMAddPackage(
@@ -65,6 +67,7 @@ if(botan_ADDED)
) )
add_library(botan STATIC ${CMAKE_CURRENT_BINARY_DIR}/botan_all.cpp ${CMAKE_CURRENT_BINARY_DIR}/botan_all.h) add_library(botan STATIC ${CMAKE_CURRENT_BINARY_DIR}/botan_all.cpp ${CMAKE_CURRENT_BINARY_DIR}/botan_all.h)
target_link_libraries(botan PUBLIC Boost::beast)
endif() endif()
find_package(Threads REQUIRED) find_package(Threads REQUIRED)
@@ -122,9 +125,9 @@ add_executable(fileserver
favicon_svg.h favicon_svg.h
) )
target_include_directories(fileserver PRIVATE include ${CMAKE_CURRENT_BINARY_DIR}) target_include_directories(fileserver PRIVATE include ${CMAKE_CURRENT_BINARY_DIR} ${LIBURING_INCLUDE_DIR})
target_compile_options(fileserver PRIVATE -msse2) target_compile_options(fileserver PRIVATE -msse2)
target_compile_definitions(fileserver PRIVATE BOOST_BEAST_FILE_BUFFER_SIZE=65535) target_compile_definitions(fileserver PRIVATE BOOST_BEAST_FILE_BUFFER_SIZE=65535 BOOST_ASIO_HAS_IO_URING)
target_link_options(fileserver PRIVATE -static) target_link_options(fileserver PRIVATE -static)
target_link_libraries(fileserver PRIVATE target_link_libraries(fileserver PRIVATE
spdlog::spdlog spdlog::spdlog