Merge pull request #11 from thinger-io/develop

Release version 1.3.0

.github/workflows/build.yml

@@ -15,13 +15,14 @@ env:
 jobs:
 
   build_version:
-    runs-on: ubuntu-latest
+    #runs-on: ubuntu-latest
+    runs-on: [self-hosted, Linux, X64]
 
     outputs:
       version: ${{ steps.version.outputs.version }}
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
 
     - name: Get tag version
       id : version
@@ -33,7 +34,8 @@ jobs:
         fi
 
   build:
-    runs-on: ubuntu-latest
+    #runs-on: ubuntu-latest
+    runs-on: [self-hosted, Linux, X64]
     needs: build_version
     strategy:
       fail-fast: false # continues with matrix even if an element fails
@@ -45,7 +47,7 @@ jobs:
     steps:
 
     - name: Checkout repository
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
       with:
         fetch-depth: 0
         ref: ${{ needs.build_version.outputs.version }}
@@ -58,7 +60,7 @@ jobs:
       run: cmake --build /build --config ${{ env.BUILD_TYPE }}
 
     - name: Upload build artifact
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       if: ${{ github.event_name == 'release' }}
       with:
         name: ${{ env.MODULE }}.${{ matrix.architecture }}
@@ -70,7 +72,8 @@ jobs:
 
   upload_to_release: # when tag is created
     if: ${{ github.event_name == 'release' }}
-    runs-on: ubuntu-latest
+    #runs-on: ubuntu-latest
+    runs-on: [self-hosted, Linux, X64]
     needs: [build_version, build]
     strategy:
       fail-fast: false # continues with matrix even if an element fails
@@ -80,7 +83,7 @@ jobs:
     steps:
 
     - name: Download ${{ matrix.architecture }} binary
-      uses: actions/download-artifact@v3
+      uses: actions/download-artifact@v4
       with:
         name: ${{ env.MODULE }}.${{ matrix.architecture }}
 

.github/workflows/release.yml

@@ -6,7 +6,8 @@ on:
 
 jobs:
   release:
-    runs-on: ubuntu-latest
+    #runs-on: ubuntu-latest
+    runs-on: [self-hosted, Linux, X64]
 
     steps:
 
@@ -15,7 +16,7 @@ jobs:
       run: echo "branch=${GITHUB_REF#refs/heads/}" >> $GITHUB_ENV
 
     - name: Checkout repository
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
       with:
         fetch-depth: 0
         ref: ${{ env.branch }}

.github/workflows/static-analysis.yml

@@ -16,7 +16,8 @@ jobs:
 
   build:
     name: Build
-    runs-on: ubuntu-22.04
+    #runs-on: ubuntu-22.04
+    runs-on: [self-hosted, Linux, X64]
     env:
       BUILD_WRAPPER_OUT_DIR: build_wrapper_output_directory # Directory where build-wrapper output will be placed
     steps:

CHANGELOG.md

@@ -1,39 +1,64 @@
 # Changelog
 
+## [1.3.0] - 2024-06-13
+
+### Added
+
+- Support for installing and demonizing client in procd - openwrt systems
+- Configuration file path can now be set through program options
+
+### Changed
+
+- Bumped fmt to version 10.2.1
+- Bumped spdlog to version 1.14.1
+
 ## [1.2.2] - 2023-10-03
+
 ### Fix
+
 - Bug in installer not allowing setting of credentials
 
 ## [1.2.1] - 2023-10-03
+
 ### Changed
+
 - Change module name to thinger\_iotmp
 
 ### Fixed
+
 - Installer returning empty device id when network connection set by ppp interface
 
 ## [1.2.0] - 2023-09-28
+
 ### Added
+
 - Add new THINGER\_STREAMS\_READY state listener
 - Install script and service file
 
 ## [1.1.0] - 2023-06-28
+
 ### Added
+
 - Allow static linking
 - Logging with spdlog as alternative to loguru
 - Allow compilation into library
 - Bin extension in CMakeLists
 
 ### Changed
+
 - Move pson/json conversion functions from nlohmann to protoson namespace
 - Added option to CMake for enabling Loguru logging library
 - Integration of json without the need for httplib
 
 ### Removed
+
 - Unmaintained loguru library
 
 ## [1.0.0] - 2023-09-03
+
 - First version
 
+[1.3.0]: https://github.com/thinger-io/IOTMP-Linux/compare/1.2.2...1.3.0
 [1.2.2]: https://github.com/thinger-io/IOTMP-Linux/compare/1.2.1...1.2.2
 [1.2.1]: https://github.com/thinger-io/IOTMP-Linux/compare/1.2.0...1.2.1
 [1.2.0]: https://github.com/thinger-io/IOTMP-Linux/compare/1.1.0...1.2.0

CMakeLists.txt

@@ -8,7 +8,7 @@ endif()
 # set package version
 SET(VERSION_MAJOR "1" CACHE STRING "Major version number")
 set(VERSION_MINOR "2" CACHE STRING "Minor version number")
-set(VERSION_PATCH "0" CACHE STRING "Patch version number")
+set(VERSION_PATCH "3" CACHE STRING "Patch version number")
 
 # add version for source code
 add_definitions(-DVERSION_MAJOR=${VERSION_MAJOR})
@@ -34,6 +34,7 @@ include(CheckCXXCompilerFlag)
 CHECK_CXX_COMPILER_FLAG("-std=c++17" COMPILER_SUPPORTS_CXX17)
 CHECK_CXX_COMPILER_FLAG("-std=c++20" COMPILER_SUPPORTS_CXX20)
 if(COMPILER_SUPPORTS_CXX20)
+    message(STATUS "The compiler ${CMAKE_CXX_COMPILER} is using version C++20.")
   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++20")
 elseif(COMPILER_SUPPORTS_CXX17)
   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++17")
@@ -112,16 +113,16 @@ endif()
 
 include(FetchContent)
 
-# fmt
-FetchContent_Declare(fmt URL https://github.com/fmtlib/fmt/releases/download/9.1.0/fmt-9.1.0.zip)
+# fmt: required for muslcc
+FetchContent_Declare(fmt URL https://github.com/fmtlib/fmt/releases/download/10.2.1/fmt-10.2.1.zip)
 FetchContent_MakeAvailable(fmt)
 list(APPEND ADDITIONAL_LIBS fmt::fmt)
 
 # spdlog
 FetchContent_Declare(
   spdlog
   GIT_REPOSITORY https://github.com/gabime/spdlog.git
-  GIT_TAG v1.11.0
+  GIT_TAG v1.14.1
 )
 FetchContent_MakeAvailable(spdlog)
 add_compile_definitions(SPDLOG_ACTIVE_LEVEL=SPDLOG_LEVEL_TRACE)