From 7a4aef991b5a6d8ae867f7d3649d92d1d3a61cc4 Mon Sep 17 00:00:00 2001 From: Valentin Kiselev Date: Fri, 26 Jul 2024 10:55:24 +0300 Subject: [PATCH 1/5] fix: pass static flag to linker --- .goreleaser.yml | 4 ++-- Makefile | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.goreleaser.yml b/.goreleaser.yml index 5f68a1ed..db37208d 100644 --- a/.goreleaser.yml +++ b/.goreleaser.yml @@ -26,7 +26,7 @@ builds: - goos: freebsd goarch: 386 ldflags: - - -s -w -X github.com/evilmartians/lefthook/internal/version.commit={{.Commit}} + - -s -w -extldflags '-static' -X github.com/evilmartians/lefthook/internal/version.commit={{.Commit}} # Full lefthook binary - id: lefthook @@ -49,7 +49,7 @@ builds: - goos: freebsd goarch: 386 ldflags: - - -s -w -X github.com/evilmartians/lefthook/internal/version.commit={{.Commit}} + - -s -w -extldflags '-static' -X github.com/evilmartians/lefthook/internal/version.commit={{.Commit}} archives: - id: lefthook diff --git a/Makefile b/Makefile index e73c1409..192170d6 100644 --- a/Makefile +++ b/Makefile @@ -1,10 +1,10 @@ COMMIT_HASH = $(shell git rev-parse HEAD) build: - go build -ldflags "-s -w -X github.com/evilmartians/lefthook/internal/version.commit=$(COMMIT_HASH)" -o lefthook + go build -ldflags "-s -w -extldflags '-static' -X github.com/evilmartians/lefthook/internal/version.commit=$(COMMIT_HASH)" -o lefthook build-with-coverage: - go build -cover -ldflags "-s -w -X github.com/evilmartians/lefthook/internal/version.commit=$(COMMIT_HASH)" -o lefthook + go build -cover -ldflags "-s -w extldflags '-static' -X github.com/evilmartians/lefthook/internal/version.commit=$(COMMIT_HASH)" -o lefthook install: build cp lefthook $$(go env GOPATH)/bin From 65b2e04ac56651d13bd1ba28960e023840fd3cf1 Mon Sep 17 00:00:00 2001 From: Valentin Kiselev Date: Fri, 26 Jul 2024 10:59:14 +0300 Subject: [PATCH 2/5] fix: set version=2 in goreleaser --- .goreleaser.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.goreleaser.yml b/.goreleaser.yml index db37208d..ae5cd8de 100644 --- a/.goreleaser.yml +++ b/.goreleaser.yml @@ -1,3 +1,4 @@ +version: 2 project_name: lefthook before: hooks: From e6f9cd3920c60cd7dbfb34a8d8d6c82e8f7e4fed Mon Sep 17 00:00:00 2001 From: Valentin Kiselev Date: Fri, 26 Jul 2024 11:05:48 +0300 Subject: [PATCH 3/5] fix: when building with goreleaser also create archives and packages --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 52d054ab..9d36997a 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -76,7 +76,7 @@ jobs: with: distribution: goreleaser version: '~> v2' - args: build --snapshot --skip=validate --clean + args: release --skip=publish --skip=snapcraft --skip=validate --clean - name: Tar binaries to preserve executable bit run: 'tar -cvf lefthook-binaries.tar --directory dist/ $(find dist/ -executable -type f -printf "%P\0" | xargs --null)' - name: Upload binaries as artifacts From 30d30d696c2f2bbe7cb5ac84aa81a48ad59a4fb4 Mon Sep 17 00:00:00 2001 From: Valentin Kiselev Date: Fri, 26 Jul 2024 11:08:51 +0300 Subject: [PATCH 4/5] ci: also trimpath --- .goreleaser.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.goreleaser.yml b/.goreleaser.yml index ae5cd8de..d8db4e73 100644 --- a/.goreleaser.yml +++ b/.goreleaser.yml @@ -26,6 +26,8 @@ builds: goarch: 386 - goos: freebsd goarch: 386 + flags: + - -trimpath ldflags: - -s -w -extldflags '-static' -X github.com/evilmartians/lefthook/internal/version.commit={{.Commit}} @@ -49,6 +51,8 @@ builds: goarch: 386 - goos: freebsd goarch: 386 + flags: + - -trimpath ldflags: - -s -w -extldflags '-static' -X github.com/evilmartians/lefthook/internal/version.commit={{.Commit}} From b13cc8c3e8911848ec38448018b03ecd0f6ee435 Mon Sep 17 00:00:00 2001 From: Valentin Kiselev Date: Fri, 26 Jul 2024 11:14:13 +0300 Subject: [PATCH 5/5] ci: add --snapshot --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 9d36997a..2a18cae7 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -76,7 +76,7 @@ jobs: with: distribution: goreleaser version: '~> v2' - args: release --skip=publish --skip=snapcraft --skip=validate --clean + args: release --snapshot --skip=publish --skip=snapcraft --skip=validate --clean - name: Tar binaries to preserve executable bit run: 'tar -cvf lefthook-binaries.tar --directory dist/ $(find dist/ -executable -type f -printf "%P\0" | xargs --null)' - name: Upload binaries as artifacts