fix: versioning and install (#6)

Co-authored-by: Danny Teller <danny.teller@tipalti.com>

Author: d-teller

.github/workflows/release.yml

@@ -187,7 +187,26 @@ jobs:
           GOARCH: ${{ matrix.goarch }}
           CGO_ENABLED: 0
         run: |
-          VERSION=${GITHUB_REF_NAME:-dev}
+          # Use Git-based version detection like our build script
+          if VERSION=$(git describe --tags --exact-match HEAD 2>/dev/null); then
+            echo "On exact tag: $VERSION"
+          elif LATEST_TAG=$(git describe --tags --abbrev=0 2>/dev/null); then
+            COMMIT_COUNT=$(git rev-list --count "$LATEST_TAG"..HEAD 2>/dev/null || echo "0")
+            SHORT_COMMIT=$(git rev-parse --short HEAD 2>/dev/null || echo "unknown")
+            if [[ "$COMMIT_COUNT" -gt 0 ]]; then
+              VERSION="${LATEST_TAG}-dev.${COMMIT_COUNT}+${SHORT_COMMIT}"
+            else
+              VERSION="$LATEST_TAG"
+            fi
+            echo "Based on tag: $VERSION"
+          elif SHORT_COMMIT=$(git rev-parse --short HEAD 2>/dev/null); then
+            VERSION="v0.0.0-dev+${SHORT_COMMIT}"
+            echo "No tags found, using commit: $VERSION"
+          else
+            VERSION="dev"
+            echo "Fallback version: $VERSION"
+          fi
+          
           COMMIT=$(git rev-parse --short HEAD)
           BUILD_TIME=$(date -u +"%Y-%m-%dT%H:%M:%SZ")
           

CHANGELOG.md

@@ -1,5 +1,12 @@
 ## [Unreleased]
 
+### Fixed
+- Fixed version command to display proper semantic versions instead of 'dev' or branch names
+- Fixed build process to use Git-based version detection that works locally and in CI/CD
+- Fixed installation script URL generation bug where info messages were captured in version string causing malformed download URLs
+- Fixed installation script artifact naming to use underscores (matlas_darwin_arm64.tar.gz) instead of hyphens to match actual release artifacts
+- Fixed installation script cleanup trap to handle unbound variables with set -u option
+
 ### Added
 - **Comprehensive Backup Features**: Complete backup and Point-in-Time Recovery implementation
 - Point-in-Time Recovery (PIT) support with proper validation workflow

Makefile

@@ -8,7 +8,7 @@ build:
 
 $(BINARY):
 	@mkdir -p $(BIN_DIR)
-	go build -o $(BINARY) .
+	./scripts/build/build.sh build -o $(BINARY)
 
 test:
 	./scripts/test.sh unit

install.ps1

@@ -144,8 +144,8 @@ function Download-Binary {
     # Remove 'v' prefix if present
     $cleanVersion = $Version -replace '^v', ''
 
-    $platform = "windows-$(Get-Architecture)"
-    $archiveName = "$BINARY_NAME-$platform.zip"
+    $platform = "windows_$(Get-Architecture)"
+    $archiveName = "$BINARY_NAME`_$platform.zip"
     $downloadUrl = "https://github.com/$REPO_OWNER/$REPO_NAME/releases/download/v$cleanVersion/$archiveName"
 
     Write-Info "Downloading $archiveName..."
@@ -176,7 +176,7 @@ function Download-Binary {
         $binaryPath = $null
         $possiblePaths = @(
             (Join-Path $tempDir "$BINARY_NAME.exe"),
-            (Join-Path $tempDir "$BINARY_NAME-$platform.exe")
+            (Join-Path $tempDir "$BINARY_NAME`_$platform.exe")
         )
 
         foreach ($path in $possiblePaths) {

install.sh

@@ -47,7 +47,7 @@ detect_platform() {
                         exit 1 ;;
     esac
 
-    echo "${os}-${arch}"
+    echo "${os}_${arch}"
 }
 
 # Check if running as root (for install dir permissions)
@@ -73,7 +73,7 @@ prepare_install_dir() {
 
 # Get the latest release version from GitHub
 get_latest_version() {
-    print_info "Fetching latest release information..."
+    print_info "Fetching latest release information..." >&2
 
     if command -v curl >/dev/null 2>&1; then
         curl -s "https://api.github.com/repos/$REPO_OWNER/$REPO_NAME/releases/latest" | \
@@ -96,12 +96,12 @@ download_binary() {
     local temp_dir
 
     temp_dir=$(mktemp -d)
-    trap 'rm -rf "$temp_dir"' EXIT
+    trap 'if [[ -n "${temp_dir:-}" ]] && [[ -d "${temp_dir:-}" ]]; then rm -rf "$temp_dir"; fi' EXIT
 
     # Remove 'v' prefix if present
     version="${version#v}"
 
-    local archive_name="${BINARY_NAME}-${platform}.tar.gz"
+    local archive_name="${BINARY_NAME}_${platform}.tar.gz"
     local download_url="https://github.com/$REPO_OWNER/$REPO_NAME/releases/download/v${version}/${archive_name}"
 
     print_info "Downloading $archive_name..."
@@ -125,8 +125,8 @@ download_binary() {
     local binary_path
     if [[ -f "$temp_dir/$BINARY_NAME" ]]; then
         binary_path="$temp_dir/$BINARY_NAME"
-    elif [[ -f "$temp_dir/${BINARY_NAME}-${platform}" ]]; then
-        binary_path="$temp_dir/${BINARY_NAME}-${platform}"
+    elif [[ -f "$temp_dir/${BINARY_NAME}_${platform}" ]]; then
+        binary_path="$temp_dir/${BINARY_NAME}_${platform}"
     else
         # Try to find any executable file
         binary_path=$(find "$temp_dir" -type f -executable | head -1)

scripts/build/build.sh

@@ -22,28 +22,59 @@ print_error() { echo -e "${RED}✗ $1${NC}"; }
 print_info() { echo -e "${BLUE}ℹ $1${NC}"; }
 
 get_version() {
-    # Try to get version from git
-    if git describe --tags --abbrev=0 2>/dev/null; then
+    # Try to get a proper semantic version from git
+    local version
+    
+    # First try to get exact tag on current commit
+    if version=$(git describe --tags --exact-match HEAD 2>/dev/null); then
+        echo "$version"
         return 0
-    elif git rev-parse --short HEAD 2>/dev/null; then
+    fi
+    
+    # Get the latest tag and add commit info if we're ahead
+    if version=$(git describe --tags --abbrev=0 2>/dev/null); then
+        local commit_count=$(git rev-list --count "$version"..HEAD 2>/dev/null || echo "0")
+        if [[ "$commit_count" -gt 0 ]]; then
+            local short_commit=$(git rev-parse --short HEAD 2>/dev/null || echo "unknown")
+            echo "${version}-dev.${commit_count}+${short_commit}"
+        else
+            echo "$version"
+        fi
         return 0
-    else
-        echo "dev"
+    fi
+    
+    # No tags found, use commit-based version
+    if version=$(git rev-parse --short HEAD 2>/dev/null); then
+        echo "v0.0.0-dev+${version}"
         return 0
     fi
+    
+    # Fallback for non-git environments
+    echo "dev"
+    return 0
+}
+
+get_commit() {
+    git rev-parse --short HEAD 2>/dev/null || echo "unknown"
+}
+
+get_build_time() {
+    date -u +"%Y-%m-%dT%H:%M:%SZ"
 }
 
 build_binary() {
     local output_name="${1:-matlas}"
-    local version
+    local version commit build_time
     version=$(get_version)
+    commit=$(get_commit)
+    build_time=$(get_build_time)
 
     print_info "Building $output_name (version: $version)..."
 
     cd "$PROJECT_ROOT"
 
-    # Build flags
-    local ldflags="-X main.version=$version -X main.buildDate=$(date -u +%Y-%m-%dT%H:%M:%SZ)"
+    # Build flags - match what release.yml uses
+    local ldflags="-s -w -X main.version=$version -X main.commit=$commit -X main.buildTime=$build_time"
 
     if go build -ldflags "$ldflags" -o "$output_name"; then
         print_success "Build completed: $output_name"
@@ -67,8 +98,10 @@ build_binary() {
 }
 
 cross_compile() {
-    local version
+    local version commit build_time
     version=$(get_version)
+    commit=$(get_commit)
+    build_time=$(get_build_time)
 
     print_info "Cross-compiling for multiple platforms..."
 
@@ -93,7 +126,8 @@ cross_compile() {
 
         print_info "Building for $os/$arch..."
 
-        local ldflags="-X main.version=$version -X main.buildDate=$(date -u +%Y-%m-%dT%H:%M:%SZ)"
+        # Build flags - match what release.yml uses
+        local ldflags="-s -w -X main.version=$version -X main.commit=$commit -X main.buildTime=$build_time"
 
         if GOOS="$os" GOARCH="$arch" go build -ldflags "$ldflags" -o "$output"; then
             print_success "Built: $output"