From cb71032ca1be4772a1955282d852d05f245d8c64 Mon Sep 17 00:00:00 2001 From: Arjun Raja Yogidas Date: Wed, 2 Oct 2024 22:33:18 +0000 Subject: [PATCH 1/4] fix: Make release binaries static Signed-off-by: Arjun Raja Yogidas --- .github/workflows/release-automation.yaml | 19 ++++++++++++++----- Makefile | 11 +++++++++-- scripts/create-releases.sh | 9 +++++++++ scripts/verify-release-artifacts.sh | 2 +- 4 files changed, 33 insertions(+), 8 deletions(-) diff --git a/.github/workflows/release-automation.yaml b/.github/workflows/release-automation.yaml index fcb0a269..2217b5c3 100644 --- a/.github/workflows/release-automation.yaml +++ b/.github/workflows/release-automation.yaml @@ -22,7 +22,7 @@ jobs: uses: "WyriHaximus/github-action-get-previous-tag@04e8485ecb6487243907e330d522ff60f02283ce" # v1.4.0 generate-artifacts: needs: get-latest-tag - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 env: # Set during setup. RELEASE_TAG: ${{ needs.get-latest-tag.outputs.tag }} @@ -43,22 +43,29 @@ jobs: export release_tag=${{ env.RELEASE_TAG }} export release_version=${release_tag/v/} # Remove v from tag name echo "DYNAMIC_BINARY_NAME=finch-daemon-${release_version}-linux-amd64.tar.gz" >> $GITHUB_ENV + echo "STATIC_BINARY_NAME=finch-daemon-${release_version}-linux-amd64-static.tar.gz" >> $GITHUB_ENV mkdir release - name: Install Go licenses run: go install github.com/google/go-licenses@latest - name: Create Third Party Licences File run: make licenses + - name: setup static dependecies + run: | + sudo apt-get update + sudo apt-get install libc6-dev -f - name: Create release binaries run: make RELEASE_TAG=${{ env.RELEASE_TAG }} release - name: Verify Release version run: | - mkdir output - tar -xzf release/${{ env.DYNAMIC_BINARY_NAME }} -C ./output - BINARY_VERSION=$(./output/finch-daemon --version | grep -oP '\d+\.\d+\.\d+') + mkdir -p output/static output/dynamic + tar -xzf release/${{ env.DYNAMIC_BINARY_NAME }} -C ./output/dynamic + tar -xzf release/${{ env.STATIC_BINARY_NAME }} -C ./output/static + DYNAMIC_BINARY_VERSION=$(./output/dynamic/finch-daemon --version | grep -oP '\d+\.\d+\.\d+') + STATIC_BINARY_VERSION=$(./output/static/finch-daemon --version | grep -oP '\d+\.\d+\.\d+') export release_tag=${{ env.RELEASE_TAG }} export release_version=${release_tag/v/} - if ["$BINARY_VERSION" != "$release_version"]; then + if ["$STATIC_BINARY_VERSION" != "$release_version"] || ["$DYNAMIC_BINARY_VERSION" != "$release_version"]; then echo "Version mismatch" exit 1 fi @@ -98,3 +105,5 @@ jobs: files: | ${{ needs.generate-artifacts.outputs.dynamic_binary_name }} ${{ needs.generate-artifacts.outputs.dynamic_binary_name }}.sha256sum + ${{ needs.generate-artifacts.outputs.static_binary_name }} + ${{ needs.generate-artifacts.outputs.static_binary_name }}.sha256sum diff --git a/Makefile b/Makefile index e81e4146..1e97e7ad 100644 --- a/Makefile +++ b/Makefile @@ -22,8 +22,15 @@ build: $(eval PACKAGE := github.com/runfinch/finch-daemon) $(eval VERSION ?= $(shell git describe --match 'v[0-9]*' --dirty='.modified' --always --tags)) $(eval GITCOMMIT := $(shell git rev-parse HEAD)$(shell if ! git diff --no-ext-diff --quiet --exit-code; then echo .m; fi)) - $(eval LDFLAGS := "-X $(PACKAGE)/version.Version=$(VERSION) -X $(PACKAGE)/version.GitCommit=$(GITCOMMIT) $(EXTRA_LDFLAGS)") - GOOS=linux go build -ldflags $(LDFLAGS) -v -o $(BINARY) $(PACKAGE)/cmd/finch-daemon +ifneq ($(STATIC),) + $(eval GO_BUILDTAGS := osusergo netgo) + $(eval LDFLAGS := "-X $(PACKAGE)/version.Version=$(VERSION) -X $(PACKAGE)/version.GitCommit=$(GITCOMMIT) -extldflags '-static'") + @echo "Building Static Binary" +else + @echo "Building Dynamic Binary" + $(eval LDFLAGS := "-X $(PACKAGE)/version.Version=$(VERSION) -X $(PACKAGE)/version.GitCommit=$(GITCOMMIT)") +endif + GOOS=linux go build $(if $(GO_BUILDTAGS), -tags "$(GO_BUILDTAGS)") -ldflags $(LDFLAGS) $(if $(STATIC), ) -v -o $(BINARY) $(PACKAGE)/cmd/finch-daemon clean: @rm -f $(BINARIES) diff --git a/scripts/create-releases.sh b/scripts/create-releases.sh index d5d1bf9f..93c164d8 100755 --- a/scripts/create-releases.sh +++ b/scripts/create-releases.sh @@ -54,6 +54,7 @@ fi release_version=${1/v/} # Remove v from tag name dynamic_binary_name=finch-daemon-${release_version}-linux-${ARCH}.tar.gz +static_binary_name=finch-daemon-${release_version}-linux-${ARCH}-static.tar.gz make build cp "$LICENSE_FILE" "${OUT_DIR}" @@ -62,6 +63,14 @@ tar -czvf "$RELEASE_DIR"/"$dynamic_binary_name" -- * popd rm -rf "{$OUT_DIR:?}"/* +STATIC=1 make build +cp "$LICENSE_FILE" "${OUT_DIR}" +pushd "$OUT_DIR" +tar -czvf "$RELEASE_DIR"/"$static_binary_name" -- * +popd +rm -rf "{$OUT_DIR:?}"/* + pushd "$RELEASE_DIR" sha256sum "$dynamic_binary_name" > "$RELEASE_DIR"/"$dynamic_binary_name".sha256sum +sha256sum "$static_binary_name" > "$RELEASE_DIR"/"$static_binary_name".sha256sum popd diff --git a/scripts/verify-release-artifacts.sh b/scripts/verify-release-artifacts.sh index f194e4d4..d90a9d35 100755 --- a/scripts/verify-release-artifacts.sh +++ b/scripts/verify-release-artifacts.sh @@ -44,7 +44,7 @@ release_tag=$1 release_version=${release_tag/v/} pushd "$release_dir" || exit 1 -tarballs=("finch-daemon-${release_version}-linux-${arch}.tar.gz") +tarballs=("finch-daemon-${release_version}-linux-${arch}.tar.gz" "finch-daemon-${release_version}-linux-${arch}-static.tar.gz") expected_contents=("finch-daemon" "THIRD_PARTY_LICENSES") release_is_valid=true From 9c9a487cea93562367f008e62e5c33d509175603 Mon Sep 17 00:00:00 2001 From: Arjun Raja Yogidas Date: Sun, 13 Oct 2024 04:03:57 +0000 Subject: [PATCH 2/4] fix: Update makefile for build target Signed-off-by: Arjun Raja Yogidas --- Makefile | 27 +++++++++++++-------------- 1 file changed, 13 insertions(+), 14 deletions(-) diff --git a/Makefile b/Makefile index 1e97e7ad..6f3e42f4 100644 --- a/Makefile +++ b/Makefile @@ -13,24 +13,23 @@ BINDIR ?= $(PREFIX)/bin BINARY = $(addprefix bin/,finch-daemon) -ifndef GODEBUG - EXTRA_LDFLAGS += -s -w +PACKAGE := github.com/runfinch/finch-daemon +VERSION := $(shell git describe --match 'v[0-9]*' --dirty='.modified' --always --tags) +GITCOMMIT := $(shell git rev-parse HEAD)$(shell if ! git diff --no-ext-diff --quiet --exit-code; then echo .m; fi) + +LDFLAGS := -X $(PACKAGE)/version.Version=$(VERSION) -X $(PACKAGE)/version.GitCommit=$(GITCOMMIT) + +ifeq ($(STATIC),) + GO_BUILDTAGS := osusergo netgo + LDFLAGS += -extldflags '-static' + $(info Building Static Binary) +else + $(info Building Dynamic Binary) endif .PHONY: build build: - $(eval PACKAGE := github.com/runfinch/finch-daemon) - $(eval VERSION ?= $(shell git describe --match 'v[0-9]*' --dirty='.modified' --always --tags)) - $(eval GITCOMMIT := $(shell git rev-parse HEAD)$(shell if ! git diff --no-ext-diff --quiet --exit-code; then echo .m; fi)) -ifneq ($(STATIC),) - $(eval GO_BUILDTAGS := osusergo netgo) - $(eval LDFLAGS := "-X $(PACKAGE)/version.Version=$(VERSION) -X $(PACKAGE)/version.GitCommit=$(GITCOMMIT) -extldflags '-static'") - @echo "Building Static Binary" -else - @echo "Building Dynamic Binary" - $(eval LDFLAGS := "-X $(PACKAGE)/version.Version=$(VERSION) -X $(PACKAGE)/version.GitCommit=$(GITCOMMIT)") -endif - GOOS=linux go build $(if $(GO_BUILDTAGS), -tags "$(GO_BUILDTAGS)") -ldflags $(LDFLAGS) $(if $(STATIC), ) -v -o $(BINARY) $(PACKAGE)/cmd/finch-daemon + GOOS=linux go build $(if $(GO_BUILDTAGS), -tags "$(GO_BUILDTAGS)") -ldflags "$(LDFLAGS)" -v -o $(BINARY) $(PACKAGE)/cmd/finch-daemon clean: @rm -f $(BINARIES) From efc3085b302067e92c65e071be72567769fc294e Mon Sep 17 00:00:00 2001 From: Arjun Raja Yogidas Date: Wed, 23 Oct 2024 18:09:58 +0000 Subject: [PATCH 3/4] ci: update make targets Signed-off-by: Arjun Raja Yogidas --- .github/workflows/release-automation.yaml | 2 +- Makefile | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/.github/workflows/release-automation.yaml b/.github/workflows/release-automation.yaml index 2217b5c3..9c312323 100644 --- a/.github/workflows/release-automation.yaml +++ b/.github/workflows/release-automation.yaml @@ -22,7 +22,7 @@ jobs: uses: "WyriHaximus/github-action-get-previous-tag@04e8485ecb6487243907e330d522ff60f02283ce" # v1.4.0 generate-artifacts: needs: get-latest-tag - runs-on: ubuntu-22.04 + runs-on: ubuntu-20.04 env: # Set during setup. RELEASE_TAG: ${{ needs.get-latest-tag.outputs.tag }} diff --git a/Makefile b/Makefile index 6f3e42f4..6f84bafb 100644 --- a/Makefile +++ b/Makefile @@ -17,8 +17,14 @@ PACKAGE := github.com/runfinch/finch-daemon VERSION := $(shell git describe --match 'v[0-9]*' --dirty='.modified' --always --tags) GITCOMMIT := $(shell git rev-parse HEAD)$(shell if ! git diff --no-ext-diff --quiet --exit-code; then echo .m; fi) +ifndef GODEBUG + EXTRA_LDFLAGS += -s -w +endif + LDFLAGS := -X $(PACKAGE)/version.Version=$(VERSION) -X $(PACKAGE)/version.GitCommit=$(GITCOMMIT) +# LDFLAGS += $(EXTRA_LDFLAGS) + ifeq ($(STATIC),) GO_BUILDTAGS := osusergo netgo LDFLAGS += -extldflags '-static' From e6982090187ffb5c3025a289e736bb7c7bb03609 Mon Sep 17 00:00:00 2001 From: Arjun Raja Yogidas Date: Thu, 24 Oct 2024 18:20:33 +0000 Subject: [PATCH 4/4] fix: update makefile Signed-off-by: Arjun Raja Yogidas --- Makefile | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/Makefile b/Makefile index 6f84bafb..45cb6070 100644 --- a/Makefile +++ b/Makefile @@ -21,22 +21,22 @@ ifndef GODEBUG EXTRA_LDFLAGS += -s -w endif -LDFLAGS := -X $(PACKAGE)/version.Version=$(VERSION) -X $(PACKAGE)/version.GitCommit=$(GITCOMMIT) - -# LDFLAGS += $(EXTRA_LDFLAGS) +LDFLAGS_BASE := -X $(PACKAGE)/version.Version=$(VERSION) -X $(PACKAGE)/version.GitCommit=$(GITCOMMIT) $(EXTRA_LDFLAGS) +.PHONY: build +build: ifeq ($(STATIC),) - GO_BUILDTAGS := osusergo netgo - LDFLAGS += -extldflags '-static' - $(info Building Static Binary) + @echo "Building Dynamic Binary" + $(eval LDFLAGS := $(LDFLAGS_BASE)) else - $(info Building Dynamic Binary) + @echo "Building Static Binary" + $(eval GO_BUILDTAGS := osusergo netgo) + $(eval LDFLAGS := $(LDFLAGS_BASE) -extldflags '-static') endif - -.PHONY: build -build: - GOOS=linux go build $(if $(GO_BUILDTAGS), -tags "$(GO_BUILDTAGS)") -ldflags "$(LDFLAGS)" -v -o $(BINARY) $(PACKAGE)/cmd/finch-daemon - + GOOS=linux go build \ + $(if $(GO_BUILDTAGS),-tags "$(GO_BUILDTAGS)") \ + -ldflags "$(LDFLAGS)" \ + -v -o $(BINARY) $(PACKAGE)/cmd/finch-daemon clean: @rm -f $(BINARIES) @rm -rf $(BIN)