Adding improved version handling

.github/workflows/release.yaml

@@ -2,6 +2,7 @@
 on:
   push:
     tags: ['v*']
+    tags-ignore: ['v*-beta*']
 
 name: Create Release
 

Dockerfile

@@ -1,5 +1,6 @@
 FROM golang:1.19 as builder
 
+ARG roo_version="unknown"
 
 WORKDIR /go/src/github.com/zerocube/roo
 
@@ -15,7 +16,7 @@ RUN go test -v ./...
 
 # -s and -w will strip out debugging information
 # From https://blog.filippo.io/shrink-your-go-binaries-with-this-one-weird-trick/
-RUN go build -ldflags "-s -w" -o /roo -v .
+RUN go build -ldflags "-s -w -X 'main.rooVersion=${roo_version}'" -o /roo -v .
 
 ENTRYPOINT ["go", "run", "."]
 

auto/build

@@ -2,16 +2,26 @@
 
 set -eu
 
-GOOS="${GOOS:-linux}"
-GOARCH="${GOARCH:-amd64}"
-GITHUB_REF="${GITHUB_REF:-""}"
+GIT_SHA="$(git rev-parse --verify HEAD)"
+
+function getVersion() {
+  if [ ! -z "${GITHUB_REF_NAME}" ]; then
+    echo "${GITHUB_REF_NAME}"
+  elif [ ! -z "${GIT_SHA}" ]; then
+    echo "${GIT_SHA}"
+  else
+    echo "unknown"
+  fi
+}
+
+ROO_VERSION="$(getVersion)"
 
 function buildCommand() {
   OUTPUT_PATH="build/roo_${GOOS}_${GOARCH}"
   echo "Building: ${OUTPUT_PATH}"
   go build -v \
   -ldflags \
-  "-X 'main.cacheDir=${CACHE_DIR:-""}' -X 'main.version=${GITHUB_REF##*/}'" \
+  "-X 'main.cacheDir=${CACHE_DIR:-""}' -X 'main.rooVersion=${ROO_VERSION}'" \
   -o "${OUTPUT_PATH}${FILE_EXT:-""}" \
   "${@}"
 }

main.go

@@ -26,7 +26,7 @@ import (
 	"github.com/aws/aws-sdk-go/service/sts"
 )
 
-const rooVersion = "0.3.1"
+var rooVersion string
 
 var debug bool
 var verbose bool
@@ -71,8 +71,8 @@ func main() {
 	config.Debug, config.Verbose = debug, verbose
 
 	if showVersionInfo {
-		if verbose {
-			fmt.Println("Roo version", rooVersion)
+		if rooVersion == "" {
+			fmt.Println("unknown_version")
 		} else {
 			fmt.Println(rooVersion)
 		}