Small fixes for the release wizard.

Author: HoustonPutman

hack/release/version/change_suffix.sh

@@ -51,7 +51,7 @@ done
 shift "$((OPTIND-1))"   # Discard the options and sentinel --
 
 if [[ -z "${VERSION_SUFFIX:-}" ]]; then
-  EXISTING_VERSION_SUFFIX="$(cat version/version.go | grep -E 'VersionSuffix([[:space:]]+)string' | grep -o '["''].*["'']' | xargs)"
+  EXISTING_VERSION_SUFFIX="$(cat version/version.go | grep -E 'VersionSuffix([[:space:]]+)=' | grep -o '["''].*["'']' | xargs)"
   if [[ -z "${EXISTING_VERSION_SUFFIX}" ]]; then
     export VERSION_SUFFIX="prerelease"
   else
@@ -62,6 +62,6 @@ fi
 echo "Updating the version suffix for the project to: ${VERSION_SUFFIX}"
 
 # Version file
-awk '$1 == "VersionSuffix"{$4 = "\"'"${VERSION_SUFFIX}"'\""} 1' version/version.go > version/version.tmp.go
+awk '$1 == "VersionSuffix"{$3 = "\"'"${VERSION_SUFFIX}"'\""} 1' version/version.go > version/version.tmp.go
 go fmt version/version.tmp.go
 mv version/version.tmp.go version/version.go

hack/release/version/propagate_version.sh

@@ -47,8 +47,8 @@ done
 shift "$((OPTIND-1))"   # Discard the options and sentinel --
 
 # Get full version string
-VERSION="$(cat version/version.go | grep -E 'Version([[:space:]]+)string' | grep -o '["''].*["'']' | xargs)"
-VERSION_SUFFIX="$(cat version/version.go | grep -E 'VersionSuffix([[:space:]]+)string' | grep -o '["''].*["'']' | xargs)"
+VERSION="$(cat version/version.go | grep -E 'Version([[:space:]]+)=' | grep -o '["''].*["'']' | xargs)"
+VERSION_SUFFIX="$(cat version/version.go | grep -E 'VersionSuffix([[:space:]]+)=' | grep -o '["''].*["'']' | xargs)"
 if [[ -n "${VERSION_SUFFIX:-}" ]]; then
   VERSION="${VERSION}-${VERSION_SUFFIX}"
 fi

hack/release/version/update_version.sh

@@ -56,6 +56,6 @@ fi
 echo "Updating the latest version throughout the repo to: ${VERSION}"
 
 # Version file
-awk '$1 == "Version"{$4 = "\"'"${VERSION}"'\""} 1' version/version.go > version/version.tmp.go
+awk '$1 == "Version"{$3 = "\"'"${VERSION}"'\""} 1' version/version.go > version/version.tmp.go
 go fmt version/version.tmp.go
 mv version/version.tmp.go version/version.go

hack/release/wizard/releaseWizard.yaml

@@ -441,7 +441,10 @@ groups:
         cmd: git checkout main
         tee: true
       - !Command
-        cmd: ./hack/release/version/remove_version_specific_info.sh -v {{ next_version }}
+        cmd: git pull --ff-only
+        tee: true
+      - !Command
+        cmd: ./hack/release/version/remove_version_specific_info.sh
         tee: true
       - !Command
         cmd: ./hack/release/version/update_version.sh -v {{ next_version }}
@@ -470,7 +473,10 @@ groups:
         cmd: git checkout {{ stable_branch }}
         tee: true
       - !Command
-        cmd: ./hack/release/version/remove_version_specific_info.sh -v {{ next_version }}
+        cmd: git pull --ff-only
+        tee: true
+      - !Command
+        cmd: ./hack/release/version/remove_version_specific_info.sh
         tee: true
       - !Command
         cmd: ./hack/release/version/update_version.sh -v {{ next_version }}