Merge upstream mtconnect/cppagent (through PR #612) into fork

.github/workflows/build-docker-image.yml

@@ -51,7 +51,7 @@ jobs:
       # checks-out your repository under $GITHUB_WORKSPACE
       # see https://github.com/actions/checkout
       - name: Checkout Agent
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       # the QEMU emulator lets us build for arm processors also
       # see https://github.com/docker/setup-qemu-action

.github/workflows/build.yml

@@ -15,11 +15,11 @@ on:
   # Enable automated build once verified
   pull_request:
     paths-ignore: ["**/*.md", "LICENSE.txt", ".gitignore"]
-    branches: [ "main", "main-dev" ]
+    branches: [ "main" ]
 
   push:
     paths-ignore: ["**/*.md", "LICENSE.txt", ".gitignore"]
-    branches: [ "main", "main-dev" ]
+    branches: [ "main" ]
     tags:
       - "v*.*.*"
 
@@ -28,8 +28,8 @@ on:
 
 jobs:
   build_windows:
-    runs-on: windows-2022
-    name: "Windows 2022 Arch: ${{ matrix.arch }}, Shared: ${{ matrix.shared }}"
+    runs-on: windows-latest
+    name: "Windows latest Arch: ${{ matrix.arch }}, Shared: ${{ matrix.shared }}"
     strategy:
       matrix:
         arch: ["x86", "amd64"]
@@ -64,11 +64,11 @@ jobs:
         echo $CTEST_OUTPUT_ON_FAILURE
 
     - name: Checkout Agent
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
 
-    - name: Cache conan packages
+    - name: Restore cached conan packages
       id: cache
-      uses: actions/cache@v3
+      uses: actions/cache@v4
       with:
         path: ${{ env.CONAN_HOME }}
         key: ${{ runner.os }}-build-${{ matrix.profile }}-${{ hashFiles('**/conanfile.py') }}
@@ -98,6 +98,12 @@ jobs:
         set CTEST_OUTPUT_ON_FAILURE=TRUE
         conan create . --build=missing -pr conan/profiles/${{ matrix.profile }} -o "&:with_docs=False" -o "&:cpack=True" -o "&:cpack_destination=${{ env.ZIP_DIR }}" -o "&:shared=${{ matrix.shared }}"
 
+    - name: Clean conan cache
+      continue-on-error: true
+      run: |
+        conan remove mtconnect_agent -c
+        conan cache clean "*" --source --build --download
+
     - name: Release
       uses: softprops/action-gh-release@v2
       if: ${{ startsWith(github.ref, 'refs/tags/') && matrix.shared == 'False' }}
@@ -119,18 +125,19 @@ jobs:
     - name: Install dependencies
       shell: bash
       run: |
+        sudo apt update
         sudo apt install -y build-essential cmake gcc-11 g++-11 python3 autoconf automake
 
     - name: Checkout Agent
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
 
-    - name: Cache conan packages
+    - name: Restore cached conan packages
       id: cache
-      uses: actions/cache@v3
+      uses: actions/cache@v4
       with:
         path: ~/.conan2
         key: ${{ runner.os }}-build-${{ matrix.shared }}-${{ hashFiles('**/conanfile.py') }}
-                      
+
     - name: Install Conan
       uses: turtlebrowser/get-conan@v1.2
 
@@ -151,7 +158,14 @@ jobs:
         export CTEST_OUTPUT_ON_FAILURE=TRUE
         conan create . --build=missing -pr conan/profiles/gcc  -o '&:shared=${{ matrix.shared }}' -o '&:with_docs=False' -o '&:cpack=True' -o '&:cpack_name=dist' -o '&:cpack_destination=${{ github.workspace }}'
 
-    - name: Cleanse package version
+    - name: Clean conan cache
+      continue-on-error: true
+      run: |
+        conan remove mtconnect_agent -c
+        conan cache clean "*" --source --build --download
+
+    - name: Derive Package Version
+      if: ${{ startsWith(github.ref, 'refs/tags/') && matrix.shared == 'False' }}
       run: |
         PACKAGE_VERSION=${{ github.ref_name  }}
         if [[ $PACKAGE_VERSION == v*.*.*.* ]]; then
@@ -161,15 +175,19 @@ jobs:
         else
           echo "PACKAGE_VERSION=0.0.0.0" >> $GITHUB_ENV
         fi
+
     - name: Prepare Debian Package
+      if: ${{ startsWith(github.ref, 'refs/tags/') && matrix.shared == 'False' }}
       shell: bash
       working-directory: ${{ github.workspace }}
       run: |
         mkdir -p pkgroot/home/edge/
         ls -lah pkgroot
         tar -xzf dist.tar.gz -C pkgroot/
         mv pkgroot/dist pkgroot/usr
+
     - name: Create Debian Package
+      if: ${{ startsWith(github.ref, 'refs/tags/') && matrix.shared == 'False' }}
       id: create_debian_package
       uses: jiro4989/build-deb-action@v3
       with:
@@ -179,9 +197,10 @@ jobs:
         arch: amd64
         desc: "MTConnect Agent for Ununtu"
         maintainer: Datanomix <support@datanomix.io>
+
     - name: Release
-      uses: softprops/action-gh-release@v2
       if: ${{ startsWith(github.ref, 'refs/tags/') && matrix.shared == 'False' }}
+      uses: softprops/action-gh-release@v2
       with:
         name: Version ${{ github.ref_name }}
         draft: true
@@ -198,15 +217,15 @@ jobs:
 
     steps:
     - name: Checkout Agent
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
 
-    - name: Cache conan packages
+    - name: Restore cached conan packages
       id: cache
-      uses: actions/cache@v3
+      uses: actions/cache@v4
       with:
         path: ~/.conan2
         key: ${{ runner.os }}-build-${{ matrix.shared }}-${{ hashFiles('**/conanfile.py') }}
-                      
+
     - name: Install Conan
       run: |
         brew install conan
@@ -226,5 +245,11 @@ jobs:
       shell: bash
       run: |
         export CTEST_OUTPUT_ON_FAILURE=TRUE
+        export MACOSX_DEPLOYMENT_TARGET=15.0
         conan create . --build=missing -pr conan/profiles/macos  -o '&:shared=${{ matrix.shared }}' -o '&:with_docs=False'
-
+
+    - name: Clean conan cache
+      continue-on-error: true
+      run: |
+        conan remove mtconnect_agent -c
+        conan cache clean "*" --source --build --download

CMakeLists.txt

@@ -1,8 +1,8 @@
 # The version number.
 set(AGENT_VERSION_MAJOR 2)
-set(AGENT_VERSION_MINOR 6)
+set(AGENT_VERSION_MINOR 7)
 set(AGENT_VERSION_PATCH 0)
-set(AGENT_VERSION_BUILD 2)
+set(AGENT_VERSION_BUILD 12)
 set(AGENT_VERSION_RC "")
 
 # This minimum version is to support Visual Studio 2019 and C++ feature checking and FetchContent
@@ -22,13 +22,14 @@ set(CMAKE_INSTALL_DATADIR "${CMAKE_INSTALL_DATADIR}/mtconnect")
 
 message(INFO " Shared build: ${SHARED_AGENT_LIB}")
 
-project(cppagent LANGUAGES C CXX)
-
 # We will define these properties by default for each CMake target to be created.
-set(CMAKE_CXX_STANDARD 17)
+set(CMAKE_CXX_STANDARD 20)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 set(CMAKE_CXX_EXTENSIONS OFF)
-set(CXX_COMPILE_FEATURES cxx_std_17)
+set(CXX_COMPILE_FEATURES cxx_std_20)
+set(CMAKE_OSX_DEPLOYMENT_TARGET 15.0)
+
+project(cppagent LANGUAGES C CXX)
 
 set(WITH_RUBY ON CACHE STRING "With Ruby Support")
 
@@ -70,6 +71,7 @@ include(cmake/remove_link_directories.cmake)
 include(cmake/osx_no_app_or_frameworks.cmake)
 include(cmake/ClangFormat.cmake)
 include(cmake/ClangTidy.cmake)
+include(cmake/Coverage.cmake)
 
 # Add our projects
 add_subdirectory(agent_lib)
@@ -124,3 +126,4 @@ set(CPACK_PACKAGE_NAME "agent")
 set(CPACK_PACKAGE_VENDOR "MTConnect.org")
 
 include(CPack)
+