Set the correct version release in the OC binary

Update `SOURCE_GIT_TAG` parsing logic to correctly identify the new tag format: `openshift-clients-<version>`. It fixes openshift#1688, openshift#744, openshift#740. Previously, it incorrectly returned `v4.2.0-alpha.0` for all releases.
codespearhead · Apr 10, 2024 · e21d0e4 · e21d0e4
1 parent 46db7c2
commit e21d0e4
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/hack/generate-versioninfo.sh b/hack/generate-versioninfo.sh
@@ -5,7 +5,7 @@ source "$(dirname "${BASH_SOURCE}")/lib/init.sh"
 # Generates the .syso file used to add compile-time VERSIONINFO metadata to the
 # Windows binary.
 function os::build::generate_windows_versioninfo() {
-  if [[ "${SOURCE_GIT_TAG}" =~ ^[a-z-]*([0-9]+)\.([0-9]+)\.([0-9]+).* ]] ; then
+  if [[ "${SOURCE_GIT_TAG}" =~ ^openshift-clients-([0-9]+)\.([0-9]+)\.([0-9]+) ]] ; then
     local major=${BASH_REMATCH[1]}
     local minor=${BASH_REMATCH[2]}
     local patch=${BASH_REMATCH[3]}

diff --git a/vendor/github.com/openshift/build-machinery-go/make/lib/golang.mk b/vendor/github.com/openshift/build-machinery-go/make/lib/golang.mk