From 7b074a3aa202e5a71f4edfb498bb86952d00a3ce Mon Sep 17 00:00:00 2001 From: Will Sobel Date: Thu, 22 May 2025 16:09:20 -0400 Subject: [PATCH 1/3] Fixed correct timestamps --- src/mtconnect/pipeline/correct_timestamp.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/mtconnect/pipeline/correct_timestamp.hpp b/src/mtconnect/pipeline/correct_timestamp.hpp index 0ea340911..1ea3fe6b1 100644 --- a/src/mtconnect/pipeline/correct_timestamp.hpp +++ b/src/mtconnect/pipeline/correct_timestamp.hpp @@ -76,7 +76,7 @@ namespace mtconnect::pipeline { m_state->m_timestamps.emplace(id, ts); - return obs; + return next(std::move(obs)); } protected: From 9da3ffe1eb55cd91bbb146fe5c0dfd120f7fb6dd Mon Sep 17 00:00:00 2001 From: Will Sobel Date: Thu, 22 May 2025 16:21:12 -0400 Subject: [PATCH 2/3] Version 2.5.0.6 --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index cdef6a6ee..b1184ec3c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2,7 +2,7 @@ set(AGENT_VERSION_MAJOR 2) set(AGENT_VERSION_MINOR 5) set(AGENT_VERSION_PATCH 0) -set(AGENT_VERSION_BUILD 5) +set(AGENT_VERSION_BUILD 6) set(AGENT_VERSION_RC "") # This minimum version is to support Visual Studio 2019 and C++ feature checking and FetchContent From 2d482b2fe141d90b6701b1110f192f2cf4f1348d Mon Sep 17 00:00:00 2001 From: Will Sobel Date: Thu, 22 May 2025 17:01:42 -0400 Subject: [PATCH 3/3] Fix for deb package workflow --- .github/workflows/build.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 9caae14fc..99e0cf647 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -153,6 +153,7 @@ jobs: - name: Cleanse package version run: | + PACKAGE_VERSION=${{ github.ref_name }} if [[ $PACKAGE_VERSION == v*.*.*.* ]]; then echo "PACKAGE_VERSION=${PACKAGE_VERSION:1}" >> $GITHUB_ENV elif [[ $PACKAGE_VERSION == [0-9].*.*.* ]]; then