Merge branch 'mi_ci_compiles_hived' into 'develop'

Mi ci compiles hived

See merge request !6

.gitlab-ci.yml

@@ -20,14 +20,19 @@ hive_fork_manager:
   tags:
     - public-runner-docker
 
-# c++_unit_tests:
-#   stage: build_and_test
-#   image: "$CI_REGISTRY_IMAGE/builder$BUILDER_IMAGE_TAG"
-#   script:
-#     - mkdir -p "$CI_JOB_NAME"/build
-#     - cd "$CI_JOB_NAME"/build
-#     - cmake -DCMAKE_BUILD_TYPE=Release ../..
-#     - make
-#     - ctest --output-on-failure -R test.unit.*
-#   tags:
-#     - public-runner-docker
+hived:
+  stage: build_and_test
+  image: "$CI_REGISTRY_IMAGE/builder$BUILDER_IMAGE_TAG"
+  script:
+    - /etc/init.d/postgresql start
+    - mkdir -p "$CI_JOB_NAME"/build
+    - cd "$CI_JOB_NAME"/build
+    - cmake -DCMAKE_BUILD_TYPE=Release -DCLEAR_VOTES=ON -DENABLE_MIRA=OFF -DBUILD_HIVE_TESTNET=OFF -DHIVE_LINT=OFF ../..
+    - make hived -j10
+    # check if sql_serializer compiles with hived
+    - test -f hive/libraries/plugins/sql_serializer/libsql_serializer_plugin.a
\ No newline at end of file
+    # check if sql_serializer plugin is included in hived plugins
+    - cd ./hive/programs/hived
+    - ./hived --help | grep psql-url
+  tags:
+    - public-runner-docker

CMakeLists.txt

@@ -3,6 +3,7 @@ CMAKE_MINIMUM_REQUIRED( VERSION 3.14 )
 PROJECT( haf )
 SET( Boost_NO_BOOST_CMAKE ON CACHE STRING "ON or OFF" FORCE )
 SET( HAF_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} )
+FILE( CREATE_LINK ${CMAKE_CURRENT_SOURCE_DIR}/src/sql_serializer ${CMAKE_CURRENT_SOURCE_DIR}/hive/libraries/plugins/sql_serializer SYMBOLIC )
 
 ADD_SUBDIRECTORY( hive EXCLUDE_FROM_ALL )
 SET_TARGET_PROPERTIES( hived PROPERTIES EXCLUDE_FROM_ALL 0 )
@@ -29,8 +30,6 @@ INCLUDE( tests )
 
 SETUP_OUTPUT_DIRECTORIES()
 
-FILE( CREATE_LINK ${CMAKE_CURRENT_SOURCE_DIR}/src/sql_serializer ${CMAKE_CURRENT_SOURCE_DIR}/hive/libraries/plugins/sql_serializer SYMBOLIC )
-
 GENERATE_GIT_VERSION_FILE()
 GET_RUNTIME_POSTGRES_VARIABLES()
 

hive @ 4ffa7069

-Subproject commit cbe4c91b817296c014ddd5fe28d1ae3cdd385873
+Subproject commit 4ffa7069efb4ce4bb9911e1d897a20f7e36a3724