Get the correct version from the binary

SumoLogic · Dec 3, 2024 · 0a98a1e · 0a98a1e
1 parent c167b4d
commit 0a98a1e
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/ci/get_version_from_binary.sh b/ci/get_version_from_binary.sh
@@ -53,7 +53,7 @@ parse_version() {
 
     output="$(${binary_path} --version)"
 
-    regex=".* ([0-9]+)\.([0-9]+)\.([0-9]+)\-sumo\-([0-9]+).*"
+    regex="otelcol-sumo version ([0-9]+)\.([0-9]+)\.([0-9]+)\-sumo\-([0-9]+).*"
 
     if [[ $output =~ $regex ]]; then
         major_version="${BASH_REMATCH[1]}"

diff --git a/otelcolbuilder/Makefile b/otelcolbuilder/Makefile
@@ -102,7 +102,8 @@ endif
 
 .PHONY: _builder
 _builder:
-	$(eval VERSION ?= devel-$(shell git rev-parse HEAD | xargs))
+	$(eval VERSION ?= $(shell git describe --tags --abbrev=5 --match "v[0-9]*"))
+	$(shell sed -i '' "s/^  version:.*/  version: ${VERSION}${FIPS_SUFFIX}/" .otelcol-builder.yaml)
 # Need to specify go path because otherwise opentelemetry-collector-builder
 # uses /usr/bin/go which on Github Actions is using preinstalled 1.15.12 by default.
 	CGO_ENABLED=$(CGO_ENABLED) $(BUILDER_BIN_NAME) \