Interim build & lint improvements

iggy-rs · Apr 22, 2024 · f60f5d5 · f60f5d5
1 parent 6ad0d0a
commit f60f5d5
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 0 deletions.
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
@@ -14,6 +14,7 @@
                 "github.remotehub",
                 "github.vscode-github-actions",
                 "ionutvmi.path-autocomplete",
+                "jbenden.c-cpp-flylint",
                 "mads-hartmann.bash-ide-vscode",
                 "matepek.vscode-catch2-test-adapter",
                 "ms-azuretools.vscode-docker",

diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -10,6 +10,11 @@
     "[cpp]": {
         "editor.defaultFormatter": "demiaochen.clang-format-indent-4"
     },
+    "c-cpp-flylint.flexelint.enable": false,
+    "c-cpp-flylint.clang.enable": false,
+    "c-cpp-flylint.cppcheck.enable": false,
+    "c-cpp-flylint.flawfinder.enable": false,
+    "c-cpp-flylint.lizard.enable": false,
     "testMate.cpp.test.advancedExecutables": [
         {
             "pattern": "${workspaceFolder}/build/tests/**/*_test",

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -13,6 +13,7 @@ endif()
 # set up library dependencies
 find_package(ada CONFIG REQUIRED)
 find_package(libuv CONFIG REQUIRED)
+find_package(nlohmann_json CONFIG REQUIRED)
 find_package(spdlog CONFIG REQUIRED)
 find_package(unofficial-sodium CONFIG REQUIRED)
 
@@ -77,6 +78,7 @@ target_link_libraries(
   ada::ada
   fmt::fmt
   libuv::uv_a
+  nlohmann_json::nlohmann_json
   unofficial-sodium::sodium
   ${WOLFSSL_LIB_DIR}/libwolfssl.a
   ${LWS_LIB_DIR}/libwebsockets.a

diff --git a/images/iggy-cpp-build/.devcontainer/devcontainer.json b/images/iggy-cpp-build/.devcontainer/devcontainer.json
@@ -1,6 +1,12 @@
 {
     "image": "mcr.microsoft.com/devcontainers/cpp:1-ubuntu-22.04",
     "features": {
+        "ghcr.io/akhildevelops/devcontainer-features/pip:0": {
+            "packages": [
+                "flawfinder",
+                "lizard"
+            ]
+        },
         "ghcr.io/devcontainers/features/common-utils:2": {},
         "ghcr.io/devcontainers/features/docker-in-docker:2": {},
         "ghcr.io/devcontainers/features/github-cli:1": {},

diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
@@ -1,6 +1,7 @@
 
 if(BUILD_TESTS)
   find_package(Catch2 CONFIG REQUIRED)
+  find_package(inja CONFIG REQUIRED)
   find_package(reproc++ CONFIG REQUIRED)
 
   add_executable(
@@ -29,6 +30,7 @@ if(BUILD_TESTS)
     iggy
     Catch2::Catch2
     Catch2::Catch2WithMain
+    pantor::inja
     reproc++
   )
 

diff --git a/vcpkg.json b/vcpkg.json
@@ -3,8 +3,10 @@
         "ada-url",
         "catch2",
         "fmt",
+        "inja",
         "libsodium",
         "libuv",
+        "nlohmann-json",
         "reproc",
         "spdlog",
         "utf8h"