Skip to content

Commit 3ceb0ed

Browse files
authored
Merge pull request #11 from coderbirju/make-binaries-static
fix: Add static binaries to release
2 parents a97a89a + dbf3fb8 commit 3ceb0ed

File tree

4 files changed

+27
-6
lines changed

4 files changed

+27
-6
lines changed

.github/workflows/release-automation.yaml

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -43,22 +43,27 @@ jobs:
4343
export release_tag=${{ env.RELEASE_TAG }}
4444
export release_version=${release_tag/v/} # Remove v from tag name
4545
echo "DYNAMIC_BINARY_NAME=finch-daemon-${release_version}-linux-amd64.tar.gz" >> $GITHUB_ENV
46+
echo "STATIC_BINARY_NAME=finch-daemon-${release_version}-linux-amd64-static.tar.gz" >> $GITHUB_ENV
4647
4748
mkdir release
4849
- name: Install Go licenses
4950
run: go install github.com/google/go-licenses@latest
5051
- name: Create Third Party Licences File
5152
run: make licenses
53+
- name: setup static dependecies
54+
run: sudo apt-get install glibc-static libstdc++-static
5255
- name: Create release binaries
5356
run: make RELEASE_TAG=${{ env.RELEASE_TAG }} release
5457
- name: Verify Release version
5558
run: |
56-
mkdir output
57-
tar -xzf release/${{ env.DYNAMIC_BINARY_NAME }} -C ./output
58-
BINARY_VERSION=$(./output/finch-daemon --version | grep -oP '\d+\.\d+\.\d+')
59+
mkdir -p output/static output/dynamic
60+
tar -xzf release/${{ env.DYNAMIC_BINARY_NAME }} -C ./output/dynamic
61+
tar -xzf release/${{ env.STATIC_BINARY_NAME }} -C ./output/static
62+
DYNAMIC_BINARY_VERSION=$(./output/dynamic/finch-daemon --version | grep -oP '\d+\.\d+\.\d+')
63+
STATIC_BINARY_VERSION=$(./output/static/finch-daemon --version | grep -oP '\d+\.\d+\.\d+')
5964
export release_tag=${{ env.RELEASE_TAG }}
6065
export release_version=${release_tag/v/}
61-
if ["$BINARY_VERSION" != "$release_version"]; then
66+
if ["$STATIC_BINARY_VERSION" != "$release_version"] || ["$DYNAMIC_BINARY_VERSION" != "$release_version"]; then
6267
echo "Version mismatch"
6368
exit 1
6469
fi

Makefile

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,15 @@ build:
1818
$(eval PACKAGE := github.com/runfinch/finch-daemon)
1919
$(eval VERSION ?= $(shell git describe --match 'v[0-9]*' --dirty='.modified' --always --tags))
2020
$(eval GITCOMMIT := $(shell git rev-parse HEAD)$(shell if ! git diff --no-ext-diff --quiet --exit-code; then echo .m; fi))
21+
ifneq ($(STATIC),)
22+
$(eval GO_BUILDTAGS := osusergo netgo)
23+
$(eval LDFLAGS := "-X $(PACKAGE)/version.Version=$(VERSION) -X $(PACKAGE)/version.GitCommit=$(GITCOMMIT) -extldflags '-static'")
24+
@echo "Building Static Binary"
25+
else
26+
@echo "Building Dynamic Binary"
2127
$(eval LDFLAGS := "-X $(PACKAGE)/version.Version=$(VERSION) -X $(PACKAGE)/version.GitCommit=$(GITCOMMIT)")
22-
GOOS=linux go build -ldflags $(LDFLAGS) -v -o $(BINARY) $(PACKAGE)/cmd/finch-daemon
28+
endif
29+
GOOS=linux go build $(if $(GO_BUILDTAGS), -tags "$(GO_BUILDTAGS)") -ldflags $(LDFLAGS) $(if $(STATIC), ) -v -o $(BINARY) $(PACKAGE)/cmd/finch-daemon
2330

2431
.PHONY: linux
2532
linux:

scripts/create-releases.sh

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@ fi
5454

5555
release_version=${1/v/} # Remove v from tag name
5656
dynamic_binary_name=finch-daemon-${release_version}-linux-${ARCH}.tar.gz
57+
static_binary_name=finch-daemon-${release_version}-linux-${ARCH}-static.tar.gz
5758

5859
make build
5960
cp "$LICENSE_FILE" "${OUT_DIR}"
@@ -62,6 +63,14 @@ tar -czvf "$RELEASE_DIR"/"$dynamic_binary_name" -- *
6263
popd
6364
rm -rf "{$OUT_DIR:?}"/*
6465

66+
STATIC=1 make build
67+
cp "$LICENSE_FILE" "${OUT_DIR}"
68+
pushd "$OUT_DIR"
69+
tar -czvf "$RELEASE_DIR"/"$static_binary_name" -- *
70+
popd
71+
rm -rf "{$OUT_DIR:?}"/*
72+
6573
pushd "$RELEASE_DIR"
6674
sha256sum "$dynamic_binary_name" > "$RELEASE_DIR"/"$dynamic_binary_name".sha256sum
75+
sha256sum "$static_binary_name" > "$RELEASE_DIR"/"$static_binary_name".sha256sum
6776
popd

scripts/verify-release-artifacts.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ release_tag=$1
4444
release_version=${release_tag/v/}
4545

4646
pushd "$release_dir" || exit 1
47-
tarballs=("finch-daemon-${release_version}-linux-${arch}.tar.gz")
47+
tarballs=("finch-daemon-${release_version}-linux-${arch}.tar.gz" "finch-daemon-${release_version}-linux-${arch}-static.tar.gz")
4848
expected_contents=("finch-daemon" "THIRD_PARTY_LICENSES")
4949
release_is_valid=true
5050

0 commit comments

Comments
 (0)