fix(ci,userspace): install latest nlohmann json in install-deps script.

Signed-off-by: Federico Di Pierro <nierro92@gmail.com>
falcosecurity · Aug 22, 2024 · 451d94e · 451d94e
1 parent a9a7f97
commit 451d94e
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 4 deletions.
diff --git a/.github/install-deps.sh b/.github/install-deps.sh
@@ -66,3 +66,23 @@ popd
 echo "=== Downloading uthash.h (1.9.8) ==="
 
 wget -P "/usr/include" "https://raw.githubusercontent.com/troydhanson/uthash/v1.9.8/src/uthash.h"
+
+# === Nlohmann json ===
+echo "=== Building and installing njson v3.11.3 ==="
+
+wget "https://github.com/nlohmann/json/archive/refs/tags/v3.11.3.tar.gz"
+
+tar xzf v3.11.3.tar.gz
+pushd json-3.11.3
+
+mkdir -p build
+cd build
+
+cmake \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DJSON_BuildTests=OFF \
+    ../
+
+make install -j
+popd
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -36,7 +36,7 @@ jobs:
     steps:
       - name: Install deps ⛓️
         run: |
-          apt update && apt install -y --no-install-recommends ca-certificates cmake build-essential git clang llvm pkg-config autoconf automake libtool libelf-dev wget libc-ares-dev libcurl4-openssl-dev libssl-dev libtbb-dev libjq-dev nlohmann-json3-dev libgrpc++-dev protobuf-compiler-grpc libgtest-dev libprotobuf-dev linux-headers-${{ matrix.arch }}
+          apt update && apt install -y --no-install-recommends ca-certificates cmake build-essential git clang llvm pkg-config autoconf automake libtool libelf-dev wget libc-ares-dev libcurl4-openssl-dev libssl-dev libtbb-dev libjq-dev libgrpc++-dev protobuf-compiler-grpc libgtest-dev libprotobuf-dev linux-headers-${{ matrix.arch }}
 
       - name: Checkout Libs ⤵️
         uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1

diff --git a/userspace/libscap/engine/gvisor/CMakeLists.txt b/userspace/libscap/engine/gvisor/CMakeLists.txt
@@ -58,7 +58,7 @@ add_custom_command(
 )
 
 if(USE_BUNDLED_NLOHMANN_JSON)
-    add_dependencies(scap njson)
+    add_dependencies(scap nlohmann_json)
 endif()
 
 if (BUILD_SHARED_LIBS)

diff --git a/userspace/libsinsp/CMakeLists.txt b/userspace/libsinsp/CMakeLists.txt
@@ -172,7 +172,6 @@ set(SINSP_PKGCONFIG_LIBRARIES
 	scap
 	"${ZLIB_LIB}"
 	"${CURL_LIBRARIES}"
-	nlohmann_json::nlohmann_json
 	"${RE2_LIB}"
 )
 
@@ -195,7 +194,7 @@ if(USE_BUNDLED_RE2)
 endif()
 
 if(USE_BUNDLED_NLOHMANN_JSON)
-	add_dependencies(sinsp njson)
+	add_dependencies(sinsp nlohmann_json)
 endif()
 
 function(prepare_cri_grpc api_version)