From fe7dcd93331914e45ac2bd66e7dd818845dab3ae Mon Sep 17 00:00:00 2001 From: Jerry Jacobs Date: Fri, 26 Jul 2024 07:26:13 +0200 Subject: [PATCH] Create release makefile target and execute from CI --- .github/workflows/build.yml | 2 +- Makefile | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index fb25509..e01331b 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -35,4 +35,4 @@ jobs: run: | ls ${{ github.workspace }} - run: echo "🍏 This job's status is ${{ job.status }}." - - run: make build + - run: make release diff --git a/Makefile b/Makefile index 2ea69ca..be8081a 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,8 @@ SOURCES=Makefile main.go main_release.go main_debug.go config.go config_release.go config_template.go GARBLE_BIN = $(shell go env GOPATH)/bin/garble +GO_ENV_VARS = CGO_ENABLED=0 + +release: socks5-ssh-proxy.release socks5-ssh-proxy.exe all: socks5-ssh-proxy socks5-ssh-proxy.release socks5-ssh-proxy.exe test: socks5-ssh-proxy @@ -9,7 +12,7 @@ test-release: socks5-ssh-proxy.release socks5-ssh-proxy: $(SOURCES) go build -o $@ socks5-ssh-proxy.release: resources $(SOURCES) - go build -tags release -o $@ + $(GO_ENV_VARS) go build -tags release -o $@ win: socks5-ssh-proxy.exe socks5-ssh-proxy.exe: resources $(GARBLE_BIN) $(SOURCES) GOOS=windows GOARCH=amd64 $(GARBLE_BIN) build -ldflags -H=windowsgui -tags release -o $@