Adjust Rust Lint CI (#30)

* fix main.rs lint

* Clean Rust lint dependencies

* Clean Rust lint dependencies

* Review C lint workflow

* Adjust build dependency order

* Build daapi_c

* Build daapi_c

* Build daapi_c

* Build daapi_c

* Build daapi_c

* Build daapi_c

* Adjsut Rust lint

* Adjsut Rust lint

* removed unused include path

* remove unnecessary libs

---------

Co-authored-by: Andre Chiarelli <[email protected]>
Co-authored-by: Munetaka Ohtani <[email protected]>

Author: 3 people

.github/workflows/linting.yaml

@@ -23,32 +23,14 @@ jobs:
           sudo apt-get update
           sudo apt-get install -y clang-tidy
           sudo apt-get install -y slurm-wlm slurm-wlm-basic-plugins libslurm-dev
-          git clone https://github.com/DaveGamble/cJSON.git
-          cd cJSON
-          mkdir build && cd build
-          cmake ..
-          make -j$(nproc)
-          sudo make install
-
-      - name: Debug cJSON Installation
-        run: |
-          echo "Checking cJSON installation..."
-          echo "cJSON include directory:"
-          find /usr -type d -name "cjson" 2>/dev/null
-          echo "cJSON library files:"
-          find /usr -type f -name "libcjson*" 2>/dev/null
-          echo "cJSON CMake files:"
-          find /usr -type f -name "cJSONConfig.cmake" 2>/dev/null
 
       - name: Install pkg-config
         run: sudo apt-get install -y pkg-config
 
       - name: Set up C environment
         run: |
-          mkdir -p build_skeleton build_spank_ibm_qrun daapi_c
-          cd daapi_c
-          cmake ../commands/qrun/daapi_c/app -DCMAKE_EXPORT_COMPILE_COMMANDS=ON
-          cd ../build_skeleton
+          mkdir -p build_skeleton build_spank_ibm_qrun
+          cd build_skeleton
           cmake ../plugins/skeleton -DCMAKE_EXPORT_COMPILE_COMMANDS=ON
           cd ../build_spank_ibm_qrun
           cmake ../plugins/spank_ibm_qrun -DCMAKE_EXPORT_COMPILE_COMMANDS=ON
@@ -84,33 +66,36 @@ jobs:
       - name: Checkout repository
         uses: actions/[email protected]
 
-      - name: Install Dependencies
-        run: |
-          sudo apt-get update
-          sudo apt-get install -y clang-tidy
-          sudo apt-get install -y slurm-wlm slurm-wlm-basic-plugins libslurm-dev
-          git clone https://github.com/DaveGamble/cJSON.git
-          cd cJSON
-          mkdir build && cd build
-          cmake ..
-          make -j$(nproc)
-          sudo make install
-
-      - name: Install pkg-config
-        run: sudo apt-get install -y pkg-config
-
-      - name: Set up C environment
-        run: |
-          mkdir -p daapi_c
-          cd daapi_c
-          cmake ../commands/qrun/daapi_c/app -DCMAKE_EXPORT_COMPILE_COMMANDS=ON
-          cd ../../
-
       - name: Install Rust
         run: |
           rustup update stable
           rustup component add clippy rustfmt
           rustfmt --version
+          
+      - name: Set up Python ${{ env.PYTHON_VERSION }}
+        uses: actions/setup-python@v5
+        with:
+          python-version: ${{ env.PYTHON_VERSION }}
+
+      - name: Run rustfmt (daapi_c)
+        working-directory: commands/qrun/daapi_c
+        run: |
+          cargo fmt --all -- --check
+          cargo build --release
+
+      - name: Build daapi_c/app
+        working-directory: commands/qrun/daapi_c/app
+        run: |
+          python -m pip install --upgrade pip
+          pip install conan
+          conan profile detect
+          conan install conanfile.txt --build=missing
+          pushd build
+          cJSON_DIR=./Release/generators cmake .. -DCMAKE_BUILD_TYPE=Release
+          popd
+          cd build
+          make clean
+          make
 
       - name: Run rustfmt (daapi)
         working-directory: commands/qrun/daapi

commands/qrun/daapi_c/app/CMakeLists.txt

@@ -1,5 +1,4 @@
 cmake_minimum_required(VERSION 3.10)
-
 set(CMAKE_CXX_STANDARD 17)
 SET(CMAKE_OSX_DEPLOYMENT_TARGET 15.2)
 
@@ -13,15 +12,7 @@ endif()
 
 set(PROJECT_ROOT ${CMAKE_CURRENT_SOURCE_DIR}/../..)
 
-# Ensure CMake can find cJSON
-set(CJSON_SEARCH_PATHS
-        $ENV{CJSON_DIR}
-        /usr/local/lib/cmake/cJSON
-        /usr/lib/cmake/cJSON
-        /usr/share/cmake/cJSON
-)
-
-find_package(cJSON REQUIRED CONFIG PATHS ${CJSON_SEARCH_PATHS} NO_DEFAULT_PATH)
+find_package(cJSON REQUIRED)
 
 function(add_example TARGET_NAME CPP_FILE)
   # source files for the client app
@@ -36,10 +27,9 @@ function(add_example TARGET_NAME CPP_FILE)
   target_link_libraries(${TARGET_NAME}
           PUBLIC
           "-L${PROJECT_ROOT}/target/${LIB_PATH} -Wl,-rpath ${PROJECT_ROOT}/target/${LIB_PATH}" direct_access_capi
-          "-lm -lstdc++"
   )
 
-  target_link_libraries(${TARGET_NAME} PRIVATE cJSON)
+  target_link_libraries(${TARGET_NAME} PRIVATE cjson::cjson)
 
   if (APPLE)
     target_link_libraries(${TARGET_NAME} PUBLIC "-framework Security")
@@ -50,12 +40,13 @@ function(add_example TARGET_NAME CPP_FILE)
     target_link_libraries(${TARGET_NAME} PUBLIC "-lcrypto")
     target_link_libraries(${TARGET_NAME} PUBLIC "-ldl")
     target_link_libraries(${TARGET_NAME} PUBLIC "-lpthread")
+    target_link_libraries(${TARGET_NAME} PUBLIC "-lm")
   endif()
 
+  # path to headerfile
   target_include_directories(${TARGET_NAME}
           PRIVATE
           ${CMAKE_CURRENT_SOURCE_DIR}/..
-          /usr/local/include
   )
 
   install (TARGETS ${TARGET_NAME} DESTINATION .)