1
0
Fork 0

Compare commits

...

11 Commits
main ... main

Author SHA1 Message Date
Dominik Meyer 6422c368de
ADD: also build on arm64
continuous-integration/drone/push Build is passing Details
continuous-integration/drone Build encountered an error Details
2023-09-04 12:04:47 +02:00
Dominik Meyer 690e600f0f
FIX: fixed dependencies changed compiler
continuous-integration/drone Build is passing Details
2023-09-04 11:51:42 +02:00
Dominik Meyer 44ba3b23cd
FIX: added missing build depdendencies
continuous-integration/drone Build encountered an error Details
2023-09-04 09:54:08 +02:00
Dominik Meyer db918e84d1
FIX: use correct git image
continuous-integration/drone Build is failing Details
2023-09-04 09:42:50 +02:00
Dominik Meyer b2034aa7fc
FIX: do submodule update
continuous-integration/drone Build encountered an error Details
2023-09-03 23:02:02 +02:00
Dominik Meyer 838d0e95fd
FIX: missing build deps
continuous-integration/drone Build is failing Details
2023-09-03 22:59:54 +02:00
Dominik Meyer 24058e3cbe
FIX: update debian package db
continuous-integration/drone Build is failing Details
2023-09-03 22:58:17 +02:00
Dominik Meyer 1a396fc27b
FIX: missing install keyword
continuous-integration/drone Build is failing Details
2023-09-03 22:57:29 +02:00
Dominik Meyer fcc294847e
FIX: volumes not required
continuous-integration/drone Build is failing Details
2023-09-03 22:56:43 +02:00
Dominik Meyer 0c83bd76ea
ADD: added first version of drone configuration
continuous-integration/drone Build encountered an error Details
2023-09-03 22:54:53 +02:00
Christina Sander c0e5c73716
MOD: Modifies cmake include for protobuf
- sets the protoc path in CMakeLists.txt file so it can also be used in top level projects
 - sets the proto source file path so it can be used in top level projects
 - uses cmake variable PROTO_SRC_PATH defined in CMakeLists for the custom command in the protobuf.cmake file
2023-08-31 11:07:31 +02:00
3 changed files with 53 additions and 5 deletions

48
.drone.yml Normal file
View File

@ -0,0 +1,48 @@
kind: pipeline
type: kubernetes
name: build-amd64
platform:
arch: amd64
node_selector:
kubernetes.io/arch: amd64
steps:
- name: submodules
image: alpine/git
commands:
- git submodule update --init --recursive
- name: build-amd64
image: debian:bookworm-slim
commands:
- apt-get update
- apt-get -qy install gcc-12 libsodium-dev cmake make build-essential pkg-config
- mkdir build
- cd build; cmake ..
- make -j 4
- make test
---
kind: pipeline
type: kubernetes
name: build-arm64
platform:
arch: arm64
node_selector:
kubernetes.io/arch: arm64
steps:
- name: submodules
image: alpine/git
commands:
- git submodule update --init --recursive
- name: build-arm64
image: debian:bookworm-slim
commands:
- apt-get update
- apt-get -qy install gcc-12 libsodium-dev cmake make build-essential pkg-config
- mkdir build
- cd build; cmake ..
- make -j 4
- make test

View File

@ -45,8 +45,8 @@ IF(NOT TARGET libzmq)
set(BUILD_STATIC ON CACHE BOOL "enable building zmq as static library")
set(ENABLE_DRAFTS ON CACHE BOOL "enable zmq drafts")
set(ENABLE_RADIX_TREE ON CACHE BOOL "enable ENABLE_RADIX_TREE drafts")
set(ENABLE_WS ON CACHE BOOL "enable websocket support")
set(WITH_OPENPGM ON CACHE BOOL "enable pgm protocol")
set(ENABLE_WS OFF CACHE BOOL "enable websocket support")
set(WITH_OPENPGM OFF CACHE BOOL "enable pgm protocol")
set(WITH_LIBSODIUM ON CACHE BOOL "enable static libsodium support")
set(WITH_LIBSODIUM_STATIC ON CACHE BOOL "enable static libsodium support")
set(ENABLE_CURVE ON CACHE BOOL "enable curve cryptography in libsodium support")
@ -65,6 +65,8 @@ IF(NOT TARGET protobuf)
SET(protobuf_BUILD_SHARED_LIBS OFF CACHE BOOL "disable shared libraries")
#SET(WITH_PROTOC ON CACHE BOOL "enable building of protoc")
add_subdirectory(libs/protobuf EXCLUDE_FROM_ALL)
set(PROTOC ${CMAKE_CURRENT_BINARY_DIR}/libs/protobuf/protoc CACHE INTERNAL "" )
set(PROTO_SRC_PATH ${CMAKE_CURRENT_SOURCE_DIR}/libs/protobuf/src CACHE INTERNAL "" )
ENDIF()
# we are building with c++20

View File

@ -13,8 +13,6 @@ function(protobuf_generate_cpp)
${ARGN})
FILE(GLOB PROTO_FILES ${protobuf_PROTO_PATH}/*.proto)
set(PROTOC ${CMAKE_BINARY_DIR}/libs/protobuf/protoc)
# set(PROTOC protoc)
FOREACH(proto ${PROTO_FILES})
FILE(TO_NATIVE_PATH ${proto} proto_native)
@ -25,7 +23,7 @@ function(protobuf_generate_cpp)
add_custom_command(
OUTPUT "${protoDIR}/${protoFILENAME}.pb.cc"
DEPENDS "${protoDIR}/${protoFILENAME}.proto"
COMMAND ${PROTOC} --cpp_out=${protoDIR} --proto_path=${protoDIR} --proto_path="${CMAKE_SOURCE_DIR}/libs/protobuf/src" "${protoDIR}/${protoFILENAME}.proto"
COMMAND ${PROTOC} --cpp_out=${protoDIR} --proto_path=${protoDIR} --proto_path=${PROTO_SRC_PATH} "${protoDIR}/${protoFILENAME}.proto"
)
ENDFOREACH(proto)