Merge pull request #16 from securebuildhq/divolgin/set-release-versions

set release versions

Author: divolgin

.envrc

@@ -0,0 +1 @@
+use flake

.github/workflows/release.yml

@@ -25,7 +25,10 @@ jobs:
           cache: true
 
       - name: Build worker (linux/amd64 and linux/arm64)
-        run: make build-worker-release
+        run: |
+          export VERSION="${GITHUB_REF#refs/tags/v}"
+          export GIT_SHA="${GITHUB_SHA}"
+          make build-worker-release
 
       - name: Stage worker binaries
         run: |
@@ -54,6 +57,11 @@ jobs:
       - name: Install dependencies
         run: cd securebuild-app && npm ci
 
+      - name: Set VERSION in build-info
+        run: |
+          VERSION="${GITHUB_REF#refs/tags/v}"
+          sed -i "s/VERSION: string = \"0.0.0\"/VERSION: string = \"$VERSION\"/" securebuild-app/lib/build-info.ts
+
       - name: Build
         run: cd securebuild-app && npm run build
         env:
@@ -91,6 +99,11 @@ jobs:
       - name: Install dependencies
         run: cd securebuild-www && npm ci
 
+      - name: Set VERSION in build-info
+        run: |
+          VERSION="${GITHUB_REF#refs/tags/v}"
+          sed -i "s/VERSION: string = \"0.0.0\"/VERSION: string = \"$VERSION\"/" securebuild-www/lib/build-info.ts
+
       - name: Build
         run: cd securebuild-www && npm run build
         env:

.gitignore

@@ -6,7 +6,6 @@ seurebuild-www/node_modules
 node_modules
 test-results
 playwright-report
-.envrc
 .direnv
 yarn.lock
 /data/

Makefile

@@ -39,6 +39,13 @@ GO_MODULE_FILES := go.mod go.sum
 # Disable CGO for all Go builds to create static binaries
 export CGO_ENABLED=0
 
+# Build version info (set at build time; release workflow overrides VERSION and GIT_SHA)
+VERSION_PACKAGE := github.com/securebuildhq/securebuild/pkg/buildversion
+VERSION ?= 0.0.0-dev
+GIT_SHA ?= $(shell git rev-parse --short HEAD 2>/dev/null || echo "unknown")
+BUILD_TIME ?= $(shell date -u +%Y-%m-%dT%H:%M:%SZ)
+BUILD_LDFLAGS := -X $(VERSION_PACKAGE).version=$(VERSION) -X $(VERSION_PACKAGE).gitSHA=$(GIT_SHA) -X $(VERSION_PACKAGE).buildTime=$(BUILD_TIME)
+
 .PHONY: migrate
 migrate:
 	@echo "Running migrations..."
@@ -113,7 +120,7 @@ bin/worker: bin/builder-linux-amd64 bin/builder-linux-arm64 $(GO_SOURCES) $(GO_M
 	@echo "Copying builder binaries for embedding..."
 	cp bin/builder-linux-amd64 pkg/builder/builder-linux-amd64
 	cp bin/builder-linux-arm64 pkg/builder/builder-linux-arm64
-	go build -o bin/worker cmd/main.go
+	go build -ldflags "$(BUILD_LDFLAGS)" -o bin/worker cmd/main.go
 	@echo "Cleaning up copied builder binaries..."
 	rm -f pkg/builder/builder-linux-amd64 pkg/builder/builder-linux-arm64
 
@@ -122,14 +129,15 @@ build-worker: bin/worker
 
 # Cross-compiled worker binaries for release (linux/amd64 and linux/arm64).
 # Embeds both builder binaries so the worker can build for either arch.
+# Set VERSION and GIT_SHA in CI (e.g. VERSION=1.2.3 GIT_SHA=abc1234 make build-worker-release).
 .PHONY: build-worker-release
 build-worker-release: bin/builder-linux-amd64 bin/builder-linux-arm64
 	@echo "Building worker for linux/amd64..."
 	cp bin/builder-linux-amd64 pkg/builder/builder-linux-amd64
 	cp bin/builder-linux-arm64 pkg/builder/builder-linux-arm64
-	GOOS=linux GOARCH=amd64 go build -o bin/securebuild-worker-linux-amd64 cmd/main.go
+	GOOS=linux GOARCH=amd64 go build -ldflags "$(BUILD_LDFLAGS)" -o bin/securebuild-worker-linux-amd64 cmd/main.go
 	@echo "Building worker for linux/arm64..."
-	GOOS=linux GOARCH=arm64 go build -o bin/securebuild-worker-linux-arm64 cmd/main.go
+	GOOS=linux GOARCH=arm64 go build -ldflags "$(BUILD_LDFLAGS)" -o bin/securebuild-worker-linux-arm64 cmd/main.go
 	@echo "Cleaning up copied builder binaries..."
 	rm -f pkg/builder/builder-linux-amd64 pkg/builder/builder-linux-arm64
 

cmd/cli/root.go

@@ -10,6 +10,7 @@ func RootCmd() *cobra.Command {
 	}
 
 	rootCmd.AddCommand(RunCmd())
+	rootCmd.AddCommand(VersionCmd())
 	rootCmd.AddCommand(OCIProxyCmd())
 	rootCmd.AddCommand(APKProxyCmd())
 	rootCmd.AddCommand(RebuildPackageCmd())

cmd/cli/version.go

@@ -0,0 +1,21 @@
+package cli
+
+import (
+	"fmt"
+
+	"github.com/securebuildhq/securebuild/pkg/buildversion"
+	"github.com/spf13/cobra"
+)
+
+func VersionCmd() *cobra.Command {
+	return &cobra.Command{
+		Use:   "version",
+		Short: "Print version, git SHA, and build time",
+		RunE: func(cmd *cobra.Command, args []string) error {
+			fmt.Printf("version: %s\n", buildversion.Version())
+			fmt.Printf("git SHA: %s\n", buildversion.GitSHA())
+			fmt.Printf("build time: %s\n", buildversion.BuildTime())
+			return nil
+		},
+	}
+}

pkg/buildversion/buildversion.go

@@ -0,0 +1,33 @@
+// Package buildversion holds version, git SHA, and build time
+// set at build time via ldflags.
+package buildversion
+
+var (
+	version   string
+	gitSHA    string
+	buildTime string
+)
+
+// Version returns the version string (e.g. "1.2.3" or "0.0.0-dev").
+func Version() string {
+	if version == "" {
+		return "0.0.0-dev"
+	}
+	return version
+}
+
+// GitSHA returns the git commit SHA at build time.
+func GitSHA() string {
+	if gitSHA == "" {
+		return "unknown"
+	}
+	return gitSHA
+}
+
+// BuildTime returns the build timestamp (UTC).
+func BuildTime() string {
+	if buildTime == "" {
+		return "unknown"
+	}
+	return buildTime
+}

securebuild-app/app/debug/page.tsx

@@ -1,14 +1,7 @@
 "use client";
 
 import React from "react";
-import { DEPLOY_TIME, VERSION } from "@/lib/build-info";
-
-// Constants for deployment time and version (these will be written during the build process)
-
-// BEGIN AUTOMATED REPLACE
-// const DEPLOY_TIME: string = "UNKNOWN";
-// const VERSION: string = "0.0.0";
-// END AUTOMATED REPLACE
+import { VERSION } from "@/lib/build-info";
 
 export default function DebugPage() {
   return (
@@ -26,10 +19,6 @@ export default function DebugPage() {
               </tr>
             </thead>
             <tbody>
-              <tr>
-                <td className="px-4 py-2 border-b border-border">DEPLOY_TIME (UTC)</td>
-                <td className="px-4 py-2 border-b border-border">{DEPLOY_TIME}</td>
-              </tr>
               <tr>
                 <td className="px-4 py-2 border-b">VERSION</td>
                 <td className="px-4 py-2 border-b">{VERSION}</td>

securebuild-app/components/dashboard-sidebar.tsx

@@ -3,7 +3,7 @@
 import Link from "next/link"
 import { usePathname } from "next/navigation"
 import { LayoutDashboard, Rocket, Package, Image, Users, Users2, CreditCard, FolderTree, FileCode, Shield, FileSearch } from "lucide-react"
-import { DEPLOY_TIME, VERSION } from "@/lib/build-info";
+import { VERSION } from "@/lib/build-info";
 
 export default function DashboardSidebar() {
   const pathname = usePathname()
@@ -186,7 +186,6 @@ export default function DashboardSidebar() {
       </div>
       <div className="p-4 mt-auto border-t border-zinc-200 dark:border-zinc-700">
         <p className="text-xs text-zinc-500 dark:text-zinc-400">Version: {VERSION}</p>
-        <p className="text-xs text-zinc-500 dark:text-zinc-400">Deployed: {DEPLOY_TIME}</p>
       </div>
     </div>
   )

securebuild-app/lib/build-info.ts

@@ -1,4 +1,3 @@
 // BEGIN AUTOMATED REPLACE
-export const DEPLOY_TIME: string = "UNKNOWN";
 export const VERSION: string = "0.0.0";
 // END AUTOMATED REPLACE