feat: build new release binaries

TBD54566975 · May 30, 2023 · be24cf7 · be24cf7
1 parent 7d868ba
commit be24cf7
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 4 deletions.
diff --git a/Makefile b/Makefile
@@ -1,5 +1,7 @@
 VERSION = $(shell git describe --tags --always --dirty)
 
+BINARIES=ftl ftl-control-plane ftl-runner-go
+
 COMMON_LOG_IN = common/log/api.go
 COMMON_LOG_OUT = common/log/log_level_string.go
 
@@ -38,7 +40,11 @@ release:
 	cd console && npm run build
 	rm -rf build
 	mkdir -p build
-	go build -o build/ftl -tags release -ldflags "-X main.version=$(VERSION)" ./cmd/ftl 
+	for binary in $(BINARIES); do \
+		CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -o build/$$binary-linux-amd64 -tags release -ldflags "-X main.version=$(VERSION)" ./cmd/$$binary ; \
+		CGO_ENABLED=0 GOOS=darwin GOARCH=amd64 go build -o build/$$binary-darwin-amd64 -tags release -ldflags "-X main.version=$(VERSION)" ./cmd/$$binary ; \
+		CGO_ENABLED=0 GOOS=darwin GOARCH=amd64 go build -o build/$$binary-darwin-arm64 -tags release -ldflags "-X main.version=$(VERSION)" ./cmd/$$binary ; \
+	done
 
 .PHONY: generate
 generate: $(SQLC_OUT) $(SCHEMA_OUT) $(PROTO_OUT) $(COMMON_LOG_OUT) ## Regenerate source.

diff --git a/cmd/ftl-control-plane/main.go b/cmd/ftl-control-plane/main.go
@@ -10,7 +10,10 @@ import (
 	"github.com/TBD54566975/ftl/controlplane"
 )
 
+var version = "dev"
+
 var cli struct {
+	Version            kong.VersionFlag    `help:"Show version."`
 	LogConfig          log.Config          `embed:"" prefix:"log-"`
 	ControlPlaneConfig controlplane.Config `embed:""`
 }
@@ -19,6 +22,7 @@ func main() {
 	kctx := kong.Parse(&cli,
 		kong.Description(`FTL - Towards a 𝝺-calculus for large-scale systems`),
 		kong.UsageOnError(),
+		kong.Vars{"version": version},
 	)
 	ctx := log.ContextWithLogger(context.Background(), log.Configure(os.Stderr, cli.LogConfig))
 	err := controlplane.Start(ctx, cli.ControlPlaneConfig)

diff --git a/cmd/ftl-runner-go/main.go b/cmd/ftl-runner-go/main.go
@@ -12,9 +12,12 @@ import (
 	runner "github.com/TBD54566975/ftl/runner-go"
 )
 
+var version = "dev"
+
 var config struct {
-	LogConfig    log.Config    `prefix:"log-" embed:""`
-	RunnerConfig runner.Config `embed:""`
+	Version      kong.VersionFlag `help:"Show version."`
+	LogConfig    log.Config       `prefix:"log-" embed:""`
+	RunnerConfig runner.Config    `embed:""`
 }
 
 func main() {
@@ -28,6 +31,7 @@ FTL - Towards a 𝝺-calculus for large-scale systems
 The Runner is the component of FTL that coordinates with the ControlPlane to spawn
 and route to user code.
 	`), kong.Vars{
+		"version":       version,
 		"deploymentdir": filepath.Join(cacheDir, "ftl-runner-go", "deployments"),
 	})
 	logger := log.Configure(os.Stderr, config.LogConfig)

diff --git a/cmd/ftl/main.go b/cmd/ftl/main.go
@@ -19,7 +19,7 @@ import (
 var version = "dev"
 
 type CLI struct {
-	Version   kong.VersionFlag `help:"Show version information."`
+	Version   kong.VersionFlag `help:"Show version."`
 	LogConfig log.Config       `embed:"" prefix:"log-" group:"Logging:"`
 	Endpoint  *url.URL         `default:"http://127.0.0.1:8892" help:"FTL endpoint to bind/connect to." env:"FTL_ENDPOINT"`