diff options
| author | vkalintiris <vasilis@netdata.cloud> | 2024-05-28 17:50:23 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-05-28 17:50:23 +0300 |
| commit | 2d59017ba52c82a85bff16b82e6c4ecf084a0374 (patch) | |
| tree | c2a0ff0c864f17c8df1c7cb1f65d0901a888445d /packaging | |
| parent | 7ed4ea779c1f5de969154d6d3a0f697c1901058e (diff) | |
Fix version for go.d plugin (#17764)
Diffstat (limited to 'packaging')
| -rw-r--r-- | packaging/cmake/Modules/NetdataGoTools.cmake | 4 | ||||
| -rw-r--r-- | packaging/cmake/Modules/NetdataVersion.cmake | 2 | ||||
| -rw-r--r-- | packaging/cmake/config.cmake.h.in | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/packaging/cmake/Modules/NetdataGoTools.cmake b/packaging/cmake/Modules/NetdataGoTools.cmake index cc9e0e1112..6526c8d7bc 100644 --- a/packaging/cmake/Modules/NetdataGoTools.cmake +++ b/packaging/cmake/Modules/NetdataGoTools.cmake @@ -5,9 +5,9 @@ # SPDX-License-Identifier: GPL if(CMAKE_BUILD_TYPE STREQUAL Debug) - set(GO_LDFLAGS "-X github.com/netdata/netdata/go/go.d.plugin/pkg/buildinfo.Version=${NETDATA_VERSION}") + set(GO_LDFLAGS "-X github.com/netdata/netdata/go/go.d.plugin/pkg/buildinfo.Version=${NETDATA_VERSION_STRING}") else() - set(GO_LDFLAGS "-w -s -X github.com/netdata/netdata/go/go.d.plugin/pkg/buildinfo.Version=${NETDATA_VERSION}") + set(GO_LDFLAGS "-w -s -X github.com/netdata/netdata/go/go.d.plugin/pkg/buildinfo.Version=${NETDATA_VERSION_STRING}") endif() # add_go_target: Add a new target that needs to be built using the Go toolchain. diff --git a/packaging/cmake/Modules/NetdataVersion.cmake b/packaging/cmake/Modules/NetdataVersion.cmake index 96f840b164..b4bdd43b07 100644 --- a/packaging/cmake/Modules/NetdataVersion.cmake +++ b/packaging/cmake/Modules/NetdataVersion.cmake @@ -24,7 +24,7 @@ function(netdata_version) endif() string(STRIP ${GIT_DESCRIBE_OUTPUT} GIT_DESCRIBE_OUTPUT) - set(GIT_DESCRIBE_OUTPUT "${GIT_DESCRIBE_OUTPUT}" PARENT_SCOPE) + set(NETDATA_VERSION_STRING "${GIT_DESCRIBE_OUTPUT}" PARENT_SCOPE) string(REGEX MATCH "v?([0-9]+)\\.([0-9]+)\\.([0-9]+)-?([0-9]+)?-?([0-9a-zA-Z]+)?" MATCHES "${GIT_DESCRIBE_OUTPUT}") if(CMAKE_MATCH_COUNT EQUAL 3) diff --git a/packaging/cmake/config.cmake.h.in b/packaging/cmake/config.cmake.h.in index cc74f37121..5494782a5a 100644 --- a/packaging/cmake/config.cmake.h.in +++ b/packaging/cmake/config.cmake.h.in @@ -166,7 +166,7 @@ #define NETDATA_VERSION_TWEAK "@NETDATA_VERSION_TWEAK@" #define NETDATA_VERSION_DESCR "@NETDATA_VERSION_DESCR@" -#define NETDATA_VERSION "@GIT_DESCRIBE_OUTPUT@" +#define NETDATA_VERSION "@NETDATA_VERSION_STRING@" #define ENABLE_JSONC 1 |