From ad747e8e8925cb9cb48cfc232f40156b0905b613 Mon Sep 17 00:00:00 2001
From: Boris Bliznioukov <blib@mail.com>
Date: Tue, 17 Feb 2026 14:27:03 +0100
Subject: [PATCH 1/3] fix(Makefile): update LDFLAGS and GOFLAGS for optimized
 build size

Signed-off-by: Boris Bliznioukov <blib@mail.com>
---
 Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index 9786b30bb..c3f889f8f 100644
--- a/Makefile
+++ b/Makefile
@@ -11,11 +11,11 @@ VERSION?=$(shell git describe --tags --always --dirty 2>/dev/null || echo "dev")
 GIT_COMMIT=$(shell git rev-parse --short=8 HEAD 2>/dev/null || echo "dev")
 BUILD_TIME=$(shell date +%FT%T%z)
 GO_VERSION=$(shell $(GO) version | awk '{print $$3}')
-LDFLAGS=-ldflags "-X main.version=$(VERSION) -X main.gitCommit=$(GIT_COMMIT) -X main.buildTime=$(BUILD_TIME) -X main.goVersion=$(GO_VERSION)"
+LDFLAGS=-ldflags "-X main.version=$(VERSION) -X main.gitCommit=$(GIT_COMMIT) -X main.buildTime=$(BUILD_TIME) -X main.goVersion=$(GO_VERSION) -s -w"
 
 # Go variables
 GO?=go
-GOFLAGS?=-v
+GOFLAGS?=-v -tags stdjson
 
 # Installation
 INSTALL_PREFIX?=$(HOME)/.local

From 2d758d714faf8d4cc7fe48d7886bb8f3a2971a8b Mon Sep 17 00:00:00 2001
From: Boris Bliznioukov <blib@mail.com>
Date: Tue, 17 Feb 2026 14:55:37 +0100
Subject: [PATCH 2/3] feat(goreleaser): add 'stdjson' tag to picoclaw build
 configuration

Signed-off-by: Boris Bliznioukov <blib@mail.com>
---
 .goreleaser.yaml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.goreleaser.yaml b/.goreleaser.yaml
index 368a0f06b..0354928f3 100644
--- a/.goreleaser.yaml
+++ b/.goreleaser.yaml
@@ -11,6 +11,8 @@ builds:
   - id: picoclaw
     env:
       - CGO_ENABLED=0
+    tags:
+      - stdjson
     goos:
       - linux
       - windows

From 2d876eaa9809d3a958ffc2e73c8eed8b8d760531 Mon Sep 17 00:00:00 2001
From: Boris Bliznioukov <blib@mail.com>
Date: Tue, 17 Feb 2026 15:00:06 +0100
Subject: [PATCH 3/3] feat(goreleaser): enhance build flags with versioning and
 commit info

Signed-off-by: Boris Bliznioukov <blib@mail.com>
---
 .github/workflows/release.yml | 2 ++
 .goreleaser.yaml              | 6 ++++++
 2 files changed, 8 insertions(+)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 9fe3a684e..4e9399128 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -55,6 +55,7 @@ jobs:
           ref: ${{ inputs.tag }}
 
       - name: Setup Go from go.mod
+        id: setup-go
         uses: actions/setup-go@v5
         with:
           go-version-file: go.mod
@@ -89,6 +90,7 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           GITHUB_REPOSITORY_OWNER: ${{ github.repository_owner }}
           DOCKERHUB_IMAGE_NAME: ${{ vars.DOCKERHUB_REPOSITORY }}
+          GOVERSION: ${{ steps.setup-go.outputs.go-version }}
 
       - name: Apply release flags
         shell: bash
diff --git a/.goreleaser.yaml b/.goreleaser.yaml
index 0354928f3..2c47f7d86 100644
--- a/.goreleaser.yaml
+++ b/.goreleaser.yaml
@@ -13,6 +13,12 @@ builds:
       - CGO_ENABLED=0
     tags:
       - stdjson
+    ldflags:
+      - -s -w
+      - -X main.version={{ .Version }}
+      - -X main.gitCommit={{ .ShortCommit }}
+      - -X main.buildTime={{ .Date }}
+      - -X main.goVersion={{ .Env.GOVERSION }}
     goos:
       - linux
       - windows