Merge pull request #8 from ryarnyah/feat/upx-ldflags

Reintegrate upx
ryarnyah · Oct 12, 2021 · 359f921 · 359f921
2 parents efb978d + a833304
commit 359f921
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 3 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -18,7 +18,9 @@ jobs:
           go-version: '1.17'
       - name: Build
         run: |
+          apt-get update && apt-get install -y upx
           make dev-dependencies
           make
           make cover
           make release
+          find build -type f ! -name "*.md5" ! -name "*.sha256" -exec upx -9 {} \;
diff --git a/.github/workflows/go-release.yml b/.github/workflows/go-release.yml
@@ -17,8 +17,10 @@ jobs:
           go-version: '1.17'
       - name: Build
         run: |
+          apt-get update && apt-get install -y upx
           make dev-dependencies
           make release
+          find build -type f ! -name "*.md5" ! -name "*.sha256" -exec upx -9 {} \;
       - uses: softprops/action-gh-release@v1
         with:
           files: "build/local-dns-proxy-*"

diff --git a/Makefile b/Makefile
@@ -23,8 +23,8 @@ ifneq ($(GITUNTRACKEDCHANGES),)
 	GITCOMMIT := $(GITCOMMIT)-dirty
 endif
 CTIMEVAR=-X $(BASE_PKG)/$(1)/version.GITCOMMIT=$(GITCOMMIT) -X $(BASE_PKG)/$(1)/version.VERSION=$(VERSION)
-GO_LDFLAGS=-ldflags "-w $(call CTIMEVAR,$(1))"
-GO_LDFLAGS_STATIC=-ldflags "-w $(call CTIMEVAR,$(1)) -extldflags -static"
+GO_LDFLAGS=-ldflags "-s -w $(call CTIMEVAR,$(1))"
+GO_LDFLAGS_STATIC=-ldflags "-s -w $(call CTIMEVAR,$(1)) -extldflags -static"
 
 # List the GOOS and GOARCH to build
 GOOSARCHES = linux/arm linux/amd64 linux/arm64 windows/amd64 windows/386

diff --git a/VERSION.txt b/VERSION.txt
@@ -1 +1 @@
-1.2.0
+1.2.1