WIP jenkins pipeline: working ubuntu arm64 libtonjson + minor fix

neodix42 · Dec 25, 2023 · 6d05d24 · 6d05d24
1 parent 4490c3b
commit 6d05d24
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/assembly/cicd/jenkins/test-builds.groovy b/assembly/cicd/jenkins/test-builds.groovy
@@ -50,6 +50,8 @@ pipeline {
                         timeout(time: 90, unit: 'MINUTES') {
                             sh '''
                             cp assembly/nix/linux-x86-64* .
+                            cp assembly/nix/microhttpd.nix .
+                            cp assembly/nix/openssl.nix .
                             export NIX_PATH=nixpkgs=https://github.com/nixOS/nixpkgs/archive/23.05.tar.gz
                             nix-build linux-x86-64-static.nix
                             mkdir tmp

diff --git a/blockchain-explorer/CMakeLists.txt b/blockchain-explorer/CMakeLists.txt
@@ -18,7 +18,7 @@ if (MHD_FOUND)
   target_link_libraries(blockchain-explorer tdutils tdactor adnllite tl_lite_api tl-lite-utils ton_crypto ton_block ${MHD_LIBRARY})
 else()
   find_package(PkgConfig REQUIRED)
-  pkg_check_modules(MHD libmicrohttpd)
+  find_package(MHD REQUIRED)
   target_include_directories(blockchain-explorer PUBLIC ${MHD_INCLUDE_DIR})
   target_link_libraries(blockchain-explorer tdutils tdactor adnllite tl_lite_api tl-lite-utils ton_crypto ton_block ${MHD_LIBRARIES})
 endif()