From ed77e42f6b84ab0bbc5c3f6769f3de0f419f5fd2 Mon Sep 17 00:00:00 2001 From: spbsoluble <1661003+spbsoluble@users.noreply.github.com> Date: Fri, 21 Mar 2025 12:59:12 -0700 Subject: [PATCH 1/4] fix(ci): Drop building of i386 architectures. Signed-off-by: spbsoluble <1661003+spbsoluble@users.noreply.github.com> --- .goreleaser.yml | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/.goreleaser.yml b/.goreleaser.yml index df5f4b3..8ed1da2 100644 --- a/.goreleaser.yml +++ b/.goreleaser.yml @@ -14,7 +14,7 @@ builds: flags: - '-trimpath' ldflags: - - '-s -w -X version.VERSION={{.Version}} -X main.commit={{.Commit}}' + - "-s -w -X 'kfutil/pkg/version.Version={{ .Version }}' -X -X 'kfutil/pkg/version.Commit={{ .Commit }} -X 'kfutil/pkg/version.Date={{ .CommitTimestamp }}'" goos: - freebsd - windows @@ -22,12 +22,8 @@ builds: - darwin goarch: - amd64 - - '386' - arm - arm64 - ignore: - - goos: darwin - goarch: '386' binary: 'kfutil' archives: - format: zip From 6962dbac60b8dbdade10148331bf06fdb9d8540d Mon Sep 17 00:00:00 2001 From: spbsoluble <1661003+spbsoluble@users.noreply.github.com> Date: Fri, 21 Mar 2025 13:23:25 -0700 Subject: [PATCH 2/4] fix(ci): Update `ldflag` variable names to match package variables. Signed-off-by: spbsoluble <1661003+spbsoluble@users.noreply.github.com> --- .goreleaser.yml | 2 +- pkg/version/version.go | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.goreleaser.yml b/.goreleaser.yml index 8ed1da2..09e1cbc 100644 --- a/.goreleaser.yml +++ b/.goreleaser.yml @@ -14,7 +14,7 @@ builds: flags: - '-trimpath' ldflags: - - "-s -w -X 'kfutil/pkg/version.Version={{ .Version }}' -X -X 'kfutil/pkg/version.Commit={{ .Commit }} -X 'kfutil/pkg/version.Date={{ .CommitTimestamp }}'" + - "-s -w -X 'kfutil/pkg/version.VERSION={{ .Version }}' -X 'kfutil/pkg/version.COMMIT={{ .Commit }}' -X 'kfutil/pkg/version.BUILD_DATE={{ .CommitTimestamp }}'" goos: - freebsd - windows diff --git a/pkg/version/version.go b/pkg/version/version.go index 3294bc0..404cad7 100644 --- a/pkg/version/version.go +++ b/pkg/version/version.go @@ -15,3 +15,5 @@ package version const VERSION = "1.6.0" +const BUILD_DATE = "2024-03-25" +const COMMIT = "HEAD" From f5d3ff51b6954fdf1a2a065294f3c1472715d450 Mon Sep 17 00:00:00 2001 From: spbsoluble <1661003+spbsoluble@users.noreply.github.com> Date: Fri, 21 Mar 2025 14:03:10 -0700 Subject: [PATCH 3/4] fix(pkg): Change package variables from `const` to `var` for build `ldflag`s. Signed-off-by: spbsoluble <1661003+spbsoluble@users.noreply.github.com> --- pkg/version/version.go | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkg/version/version.go b/pkg/version/version.go index 404cad7..31f7456 100644 --- a/pkg/version/version.go +++ b/pkg/version/version.go @@ -14,6 +14,8 @@ package version -const VERSION = "1.6.0" -const BUILD_DATE = "2024-03-25" -const COMMIT = "HEAD" +var ( + VERSION = "1.6.0" + BUILD_DATE = "2024-03-25" + COMMIT = "HEAD" +) From 8e53d9812e3ef4d7685192c5e8947e95b1629131 Mon Sep 17 00:00:00 2001 From: spbsoluble <1661003+spbsoluble@users.noreply.github.com> Date: Fri, 21 Mar 2025 14:11:43 -0700 Subject: [PATCH 4/4] chore(docs): Update CHANGELOG.md Signed-off-by: spbsoluble <1661003+spbsoluble@users.noreply.github.com> --- CHANGELOG.md | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index f645123..60bbcab 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,11 @@ +# v1.6.2 + +## Fixes + +### CLI + +- `version`: Correct version is reported for `kfutil version` + # v1.6.1 ## Fixes