set to release tag and fill if empty

Signed-off-by: Troy Connor <[email protected]>

Author: troy0820

.github/workflows/release.yaml

@@ -14,6 +14,8 @@ jobs:
     name: Upload binaries to release
     runs-on: ubuntu-latest
     steps:
+    - name: Set env
+      run:  echo "RELEASE_TAG=${GITHUB_REF:10}" >> $GITHUB_ENV
     - name: Check out code
       uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # tag=v4.2.2
     - name: Calculate go version

Makefile

@@ -39,7 +39,6 @@ export GOPROXY
 # Active module mode, as we use go modules to manage dependencies
 export GO111MODULE=on
 
-BRANCHVERSION := $(shell git symbolic-ref --short HEAD)
 # Hosts running SELinux need :z added to volume mounts
 SELINUX_ENABLED := $(shell cat /sys/fs/selinux/enforce 2> /dev/null || echo 0)
 
@@ -175,7 +174,7 @@ release-binary: $(RELEASE_DIR)
 		-v "$$(pwd):/workspace$(DOCKER_VOL_OPTS)" \
 		-w /workspace/tools/setup-envtest \
 		golang:$(GO_VERSION) \
-		go build -a -trimpath -ldflags "-X 'main.BranchVersion=$(BRANCHVERSION)' -extldflags '-static'" \
+		go build -a -trimpath -ldflags "-X 'main.BranchVersion=$(RELEASE_TAG)' -extldflags '-static'" \
 		-o ./out/$(RELEASE_BINARY) ./
 
 ## --------------------------------------

tools/setup-envtest/main.go

@@ -53,7 +53,7 @@ var (
 	index = flag.String("index", remote.DefaultIndexURL, "index to discover envtest binaries")
 
 	// BranchVersion is the current setup-envtest branch that is used for the binary version of setup-envtest.
-	BranchVersion = "unknown"
+	BranchVersion = ""
 )
 
 // TODO(directxman12): handle interrupts?

tools/setup-envtest/workflows/workflows.go

@@ -7,6 +7,7 @@ import (
 	"context"
 	"fmt"
 	"io"
+	"runtime/debug"
 
 	"github.com/go-logr/logr"
 
@@ -95,5 +96,14 @@ type Version struct {
 
 // Do executes the workflow.
 func (v Version) Do(env *envp.Env) {
+	version := "(unknown)"
+	if v.BinaryVersion == "" {
+		info, ok := debug.ReadBuildInfo()
+		if (ok && info != nil) || info.Main.Version != "" {
+			// binary has not been built with module support or doesn't contain a version.
+			version = info.Main.Version
+		}
+		v.BinaryVersion = version
+	}
 	fmt.Fprintf(env.Out, "setup-envtest version: %s\n", v.BinaryVersion)
 }

tools/setup-envtest/workflows/workflows_test.go

@@ -8,6 +8,7 @@ import (
 	"fmt"
 	"io/fs"
 	"path/filepath"
+	"runtime/debug"
 	"sort"
 	"strings"
 
@@ -447,11 +448,20 @@ var _ = Describe("Workflows", func() {
 	Describe("version", func() {
 		It("should print out the version based on the Binary Version", func() {
 			v := wf.Version{
-				BinaryVersion: "release-0.18",
+				BinaryVersion: "v0.18.2",
 			}
 			v.Do(env)
 			Expect(out.String()).ToNot(BeEmpty())
-			Expect(out.String()).To(Equal("setup-envtest version: release-0.18\n"))
+			Expect(out.String()).To(Equal("setup-envtest version: v0.18.2\n"))
+		})
+
+		It("should print out the version if the RELEASE_TAG is empty", func() {
+			v := wf.Version{}
+			v.Do(env)
+			info, ok := debug.ReadBuildInfo()
+			Expect(ok).To(BeTrue())
+			Expect(out.String()).ToNot(BeEmpty())
+			Expect(out.String()).To(Equal(fmt.Sprintf("setup-envtest version: %s\n", info.Main.Version)))
 		})
 	})