update ci

.github/workflows/ci.yml

@@ -58,54 +58,6 @@ jobs:
           path: |
             neuron-sdk-*.tar.gz
 
-  cross-build-old:
-    runs-on: ubuntu-18.04
-    strategy:
-      matrix:
-        arch:
-          - [aarch64-linux-gnu, aarch64, arm64]
-          - [arm-linux-gnueabihf, armv4, armhf]
-          - [x86_64-linux-gnu, x86_64, amd64]
-    container: neugates/build_old:${{ matrix.arch[1] }}-2.3
-
-    steps:
-      - uses: actions/checkout@v3
-
-      - uses: actions/checkout@v3
-        with:
-          repository: troydhanson/uthash
-          path: extern/uthash
-
-      - name: compile
-        run: |
-          git config --global --add safe.directory $(pwd)
-          mkdir -p build && cd build
-          cmake .. -DCMAKE_TOOLCHAIN_FILE=../cmake/${{ matrix.arch[0] }}.cmake \
-            -DCMAKE_BUILD_TYPE=Release -DDISABLE_UT=ON
-          make -j4
-
-      - name: fetch dashboard
-        uses: dsaltares/fetch-gh-release-asset@master
-        with:
-          repo: "emqx/neuron-dashboard-src"
-          version: "tags/${{ env.UI_VERSION }}"
-          file: "neuron-dashboard.zip"
-          target: "neuron-dashboard.zip"
-
-      - name: unpack dashboard
-        run: |
-          unzip neuron-dashboard.zip -d ./build
-
-      - name: Create neuron sdk package
-        run: |
-          ./package-sdk.sh -p ${{ matrix.arch[2] }} -n neuron-sdk-old-$VERSION
-
-      - uses: actions/upload-artifact@v3
-        with:
-          name: neuron-sdk-old-${{ matrix.arch[2] }}
-          path: |
-            neuron-sdk-old-*.tar.gz
-
   build-debug-sdk:
     runs-on: ubuntu-20.04
     strategy:
@@ -178,7 +130,7 @@ jobs:
     strategy:
       matrix:
         arch: [arm64, armhf, amd64]
-        type: [neuron-sdk, neuron-sdk-old]
+        type: [neuron-sdk]
         package: [tar.gz]
 
     steps:

cmake/aarch64-linux-gnu.cmake

@@ -1,7 +1,7 @@
 set(CMAKE_SYSTEM_NAME Linux)
 set(COMPILER_PREFIX aarch64-linux-gnu)
 set(CMAKE_SYSTEM_PROCESSOR aarch64)
-set(LIBRARY_DIR /opt/externs/libs)
+set(LIBRARY_DIR /home/neuron/libs)
 
 set(CMAKE_C_COMPILER ${COMPILER_PREFIX}-gcc)
 set(CMAKE_CXX_COMPILER ${COMPILER_PREFIX}-g++)

cmake/arm-linux-gnueabi.cmake

@@ -1,7 +1,7 @@
 set(CMAKE_SYSTEM_NAME Linux)
 set(COMPILER_PREFIX arm-linux-gnueabi)
 set(CMAKE_SYSTEM_PROCESSOR armv5tejl)
-set(LIBRARY_DIR /opt/externs/libs)
+set(LIBRARY_DIR /home/neuron/libs)
 
 set(CMAKE_C_COMPILER ${COMPILER_PREFIX}-gcc)
 set(CMAKE_CXX_COMPILER ${COMPILER_PREFIX}-g++)

cmake/arm-linux-gnueabihf.cmake

@@ -1,7 +1,7 @@
 set(CMAKE_SYSTEM_NAME Linux)
 set(COMPILER_PREFIX arm-linux-gnueabihf)
 set(CMAKE_SYSTEM_PROCESSOR armv7l)
-set(LIBRARY_DIR /opt/externs/libs)
+set(LIBRARY_DIR /home/neuron/libs)
 
 set(CMAKE_C_COMPILER ${COMPILER_PREFIX}-gcc)
 set(CMAKE_CXX_COMPILER ${COMPILER_PREFIX}-g++)

cmake/x86_64-linux-gnu.cmake

@@ -1,7 +1,24 @@
 set(CMAKE_SYSTEM_NAME Linux)
 set(COMPILER_PREFIX x86_64-linux-gnu)
 set(CMAKE_SYSTEM_PROCESSOR x86_64)
-set(LIBRARY_DIR /usr/local)
+set(LIBRARY_DIR /home/neuron/libs)
 
+set(CMAKE_C_COMPILER ${COMPILER_PREFIX}-gcc)
+set(CMAKE_CXX_COMPILER ${COMPILER_PREFIX}-g++)
+set(CMAKE_AR ${COMPILER_PREFIX}-ar)
+set(CMAKE_LINKER ${COMPILER_PREFIX}-ld)
+set(CMAKE_NM ${COMPILER_PREFIX}-nm)
+set(CMAKE_OBJDUMP ${COMPILER_PREFIX}-objdump)
+set(CMAKE_RANLIB ${COMPILER_PREFIX}-ranlib)
 set(CMAKE_STAGING_PREFIX ${LIBRARY_DIR}/${COMPILER_PREFIX})
-set(CMAKE_PREFIX_PATH ${CMAKE_STAGING_PREFIX})
+set(CMAKE_PREFIX_PATH ${CMAKE_STAGING_PREFIX})
+
+include_directories(SYSTEM ${CMAKE_STAGING_PREFIX}/include)
+include_directories(SYSTEM ${CMAKE_STAGING_PREFIX}/openssl/include)
+set(CMAKE_FIND_ROOT_PATH ${CMAKE_STAGING_PREFIX})
+set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
+set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
+set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
+link_directories(${CMAKE_STAGING_PREFIX})
+
+file(COPY ${CMAKE_STAGING_PREFIX}/lib/libzlog.so.1.2 DESTINATION /usr/local/lib)

package-sdk.sh

@@ -44,7 +44,7 @@ cp -r build/dist ${package_name}/
 
 cp build/neuron ${package_name}
 cp build/libneuron-base.so ${package_name}/lib
-cp /library/zlog/src/libzlog.so.1.2 ${package_name}/lib
+cp /usr/local/lib/libzlog.so.1.2 ${package_name}/lib
 
 cp persistence/*.sql ${package_name}/config/
 

tests/CMakeLists.txt

@@ -24,7 +24,7 @@ target_include_directories(jwt_test PRIVATE
     ${CMAKE_SOURCE_DIR}/src 
 	${CMAKE_SOURCE_DIR}/include
 	${CMAKE_SOURCE_DIR}/src/utils)
-target_link_libraries(jwt_test neuron-base gtest_main gtest jansson ssl crypto jwt)
+target_link_libraries(jwt_test neuron-base gtest_main gtest jansson ssl crypto jwt libzlog.so)
 
 add_executable(base64_test base64_test.cc ${CMAKE_SOURCE_DIR}/src/utils/base64.c)
 target_include_directories(base64_test PRIVATE