Fix version for go.d plugin (#17764)
vkalintiris committed
May 28, 2024 at 17:50 UTC
2d59017ba52c82a85bff16b82e6c4ecf084a0374
4 files changed
+4
-5
CMakeLists.txt
-1
@@ -2367,7 +2367,6 @@ set(CONFIGURE_COMMAND "dummy-configure-command")
2367
if (NOT NETDATA_USER)
2368
set(NETDATA_USER "netdata")
2369
endif()
2370
-set(VERSION "${GIT_DESCRIBE_OUTPUT}")
2370
2371
configure_file(packaging/cmake/config.cmake.h.in config.h)
2372
packaging/cmake/Modules/NetdataGoTools.cmake
+2
-2
@@ -5,9 +5,9 @@
5
# SPDX-License-Identifier: GPL
6
7
if(CMAKE_BUILD_TYPE STREQUAL Debug)
8
- set(GO_LDFLAGS "-X github.com/netdata/netdata/go/go.d.plugin/pkg/buildinfo.Version=${NETDATA_VERSION}")
8
+ set(GO_LDFLAGS "-X github.com/netdata/netdata/go/go.d.plugin/pkg/buildinfo.Version=${NETDATA_VERSION_STRING}")
9
else()
10
- set(GO_LDFLAGS "-w -s -X github.com/netdata/netdata/go/go.d.plugin/pkg/buildinfo.Version=${NETDATA_VERSION}")
10
+ set(GO_LDFLAGS "-w -s -X github.com/netdata/netdata/go/go.d.plugin/pkg/buildinfo.Version=${NETDATA_VERSION_STRING}")
11
endif()
12
13
# add_go_target: Add a new target that needs to be built using the Go toolchain.
packaging/cmake/Modules/NetdataVersion.cmake
+1
-1
@@ -24,7 +24,7 @@ function(netdata_version)
24
endif()
25
26
string(STRIP ${GIT_DESCRIBE_OUTPUT} GIT_DESCRIBE_OUTPUT)
27
- set(GIT_DESCRIBE_OUTPUT "${GIT_DESCRIBE_OUTPUT}" PARENT_SCOPE)
27
+ set(NETDATA_VERSION_STRING "${GIT_DESCRIBE_OUTPUT}" PARENT_SCOPE)
28
29
string(REGEX MATCH "v?([0-9]+)\\.([0-9]+)\\.([0-9]+)-?([0-9]+)?-?([0-9a-zA-Z]+)?" MATCHES "${GIT_DESCRIBE_OUTPUT}")
30
if(CMAKE_MATCH_COUNT EQUAL 3)
packaging/cmake/config.cmake.h.in
+1
-1
@@ -166,7 +166,7 @@
166
#define NETDATA_VERSION_TWEAK "@NETDATA_VERSION_TWEAK@"
167
#define NETDATA_VERSION_DESCR "@NETDATA_VERSION_DESCR@"
168
169
-#define NETDATA_VERSION "@GIT_DESCRIBE_OUTPUT@"
169
+#define NETDATA_VERSION "@NETDATA_VERSION_STRING@"
170
171
#define ENABLE_JSONC 1
172