See https://hashicorp.atlassian.net/browse/RELENG-619 - version updat…

…es to better support CRT/VBA.

.github/workflows/build-waypoint-oss.yml

@@ -72,8 +72,6 @@ jobs:
           GOARCH: ${{ inputs.goarch }}
           WAYPOINT_GOOS: ${{ inputs.goos }}
           WAYPOINT_GOARCH: ${{ inputs.goarch }}
-          BASE_VERSION: ${{ inputs.waypoint-base-version }}
-          PRERELEASE: ${{ inputs.waypoint-prerelease }}
           CGO_ENABLED: ${{ inputs.cgo-enabled }}
           CRT_BIN_NAME: ${{ steps.get-bin-name.outputs.bin-name }}
         uses: hashicorp/[email protected]

Makefile

@@ -5,7 +5,7 @@ GIT_DIRTY=$$(test -n "`git status --porcelain`" && echo "+CHANGES" || true)
 GIT_DESCRIBE=$$(git describe --tags --always --match "v*")
 GIT_IMPORT="github.com/hashicorp/waypoint/internal/version"
 GOLDFLAGS="-s -w -X $(GIT_IMPORT).GitCommit=$(GIT_COMMIT)$(GIT_DIRTY) -X $(GIT_IMPORT).GitDescribe=$(GIT_DESCRIBE)"
-CRT_GOLDFLAGS="-s -w -X $(GIT_IMPORT).GitCommit=$(GIT_COMMIT)$(GIT_DIRTY) -X $(GIT_IMPORT).Version=$(BASE_VERSION) -X $(GIT_IMPORT).VersionPrerelease=$(PRERELEASE)"
+CRT_GOLDFLAGS="-s -w -X $(GIT_IMPORT).GitCommit=$(GIT_COMMIT)$(GIT_DIRTY)"
 GO_CMD?=go
 CGO_ENABLED?=0
 WP_SERVER_PLATFORM?="linux/amd64"

internal/ceb/ceb.go

@@ -9,6 +9,7 @@ package ceb
 import (
 	"context"
 	"fmt"
+	"github.com/hashicorp/waypoint/version"
 	"os"
 	"os/exec"
 	"strconv"
@@ -22,7 +23,6 @@ import (
 	"github.com/hashicorp/waypoint/internal/env"
 	"github.com/hashicorp/waypoint/internal/pkg/gatedwriter"
 	"github.com/hashicorp/waypoint/internal/plugin"
-	"github.com/hashicorp/waypoint/internal/version"
 	"github.com/hashicorp/waypoint/pkg/server"
 	pb "github.com/hashicorp/waypoint/pkg/server/gen"
 )

internal/ceb/url.go

@@ -6,14 +6,14 @@ package ceb
 import (
 	"context"
 	"fmt"
+	"github.com/hashicorp/waypoint/version"
 
 	"github.com/certifi/gocertifi"
 	"github.com/hashicorp/horizon/pkg/agent"
 	"github.com/hashicorp/horizon/pkg/discovery"
 	hznpb "github.com/hashicorp/horizon/pkg/pb"
 	"github.com/pkg/errors"
 
-	"github.com/hashicorp/waypoint/internal/version"
 	pb "github.com/hashicorp/waypoint/pkg/server/gen"
 )
 

internal/cli/deployment_list.go

@@ -7,6 +7,7 @@ import (
 	"context"
 	"encoding/json"
 	"fmt"
+	"github.com/hashicorp/waypoint/version"
 	"sort"
 	"strconv"
 	"strings"
@@ -22,7 +23,6 @@ import (
 	clientpkg "github.com/hashicorp/waypoint/internal/client"
 	"github.com/hashicorp/waypoint/internal/clierrors"
 	"github.com/hashicorp/waypoint/internal/pkg/flag"
-	"github.com/hashicorp/waypoint/internal/version"
 	pb "github.com/hashicorp/waypoint/pkg/server/gen"
 )
 

internal/cli/main.go

@@ -9,6 +9,7 @@ import (
 	"bytes"
 	"context"
 	"fmt"
+	"github.com/hashicorp/waypoint/version"
 	"io"
 	"io/ioutil"
 	"os"
@@ -18,13 +19,12 @@ import (
 
 	"github.com/hashicorp/go-hclog"
 	"github.com/hashicorp/go-plugin"
-	"github.com/mitchellh/cli"
 	"github.com/mitchellh/go-glint"
 
 	"github.com/hashicorp/waypoint-plugin-sdk/terminal"
 	"github.com/hashicorp/waypoint/internal/env"
 	"github.com/hashicorp/waypoint/internal/pkg/signalcontext"
-	"github.com/hashicorp/waypoint/internal/version"
+	"github.com/mitchellh/cli"
 )
 
 const (

internal/cli/release_list.go

@@ -7,6 +7,7 @@ import (
 	"context"
 	"encoding/json"
 	"fmt"
+	"github.com/hashicorp/waypoint/version"
 	"sort"
 	"strconv"
 	"strings"
@@ -21,7 +22,6 @@ import (
 	clientpkg "github.com/hashicorp/waypoint/internal/client"
 	"github.com/hashicorp/waypoint/internal/clierrors"
 	"github.com/hashicorp/waypoint/internal/pkg/flag"
-	"github.com/hashicorp/waypoint/internal/version"
 	pb "github.com/hashicorp/waypoint/pkg/server/gen"
 )
 

internal/cli/status.go

@@ -7,6 +7,7 @@ import (
 	"context"
 	"encoding/json"
 	"fmt"
+	"github.com/hashicorp/waypoint/version"
 	"strings"
 
 	"github.com/dustin/go-humanize"
@@ -20,7 +21,6 @@ import (
 	clientpkg "github.com/hashicorp/waypoint/internal/client"
 	"github.com/hashicorp/waypoint/internal/clierrors"
 	"github.com/hashicorp/waypoint/internal/pkg/flag"
-	"github.com/hashicorp/waypoint/internal/version"
 	pb "github.com/hashicorp/waypoint/pkg/server/gen"
 )
 

internal/cli/version.go

@@ -6,12 +6,12 @@ package cli
 import (
 	"context"
 	"errors"
+	"github.com/hashicorp/waypoint/version"
 	"time"
 
 	"github.com/posener/complete"
 
 	"github.com/hashicorp/waypoint/internal/pkg/flag"
-	"github.com/hashicorp/waypoint/internal/version"
 	"github.com/hashicorp/waypoint/pkg/serverclient"
 )
 

pkg/protocolversion/current.go

@@ -4,8 +4,8 @@
 package protocolversion
 
 import (
-	"github.com/hashicorp/waypoint/internal/version"
 	pb "github.com/hashicorp/waypoint/pkg/server/gen"
+	"github.com/hashicorp/waypoint/version"
 )
 
 // !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!

version/VERSION

@@ -1 +1 @@
-0.12.0
+0.12.0

internal/version/version.go → version/version.go

@@ -5,17 +5,22 @@ package version
 
 import (
 	"bytes"
+	_ "embed"
 	"fmt"
+	"strings"
 )
 
 var (
 	// The git commit that was compiled. This will be filled in by the compiler.
 	GitCommit   string
 	GitDescribe string
 
-	Version           = "0.12.0" // Note: This value should match /version/VERSION!
-	VersionPrerelease = ""
-	VersionMetadata   = ""
+	// Version and VersionPrerelease info are now being embedded directly from the VERSION file.
+	// VersionMetadata is being passed in via ldflags in CI, otherwise the default set here is used.
+	//go:embed VERSION
+	fullVersion                   string
+	Version, VersionPrerelease, _ = strings.Cut(strings.TrimSpace(fullVersion), "-")
+	VersionMetadata               = ""
 )
 
 // VersionInfo