package/tun2socks
1
0
Fork 0
mirror of https://github.com/xjasonlyu/tun2socks.git synced 2025-10-07 17:51:16 +08:00
Code Issues Packages Projects Releases Wiki Activity

Chore: always use zip to release

Browse Source
This commit is contained in:
xjasonlyu
2021-02-14 11:21:36 +08:00
parent 43b8dd885d
commit d98e2234d9
5 changed files with 30 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.dockerignore
View File

@@ -2,5 +2,5 @@
.gitignore .gitignore
# Other # Other
bin/* build/*
docs/* docs/*

2
.github/workflows/go.yml vendored
View File

@@ -52,6 +52,6 @@ jobs:
env: env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with: with:
files: bin/* files: build/*
draft: true draft: true
prerelease: true prerelease: true

2
.gitignore vendored
View File

@@ -4,7 +4,7 @@
*.dll *.dll
*.so *.so
*.dylib *.dylib
bin/ build/
# IDE # IDE
.idea/ .idea/

2
Dockerfile
View File

@@ -6,7 +6,7 @@ COPY . /tun2socks-src
RUN apk add --no-cache make git \ RUN apk add --no-cache make git \
&& go mod download \ && go mod download \
&& make tun2socks \ && make tun2socks \
&& mv ./bin/tun2socks /tun2socks && mv ./build/tun2socks /tun2socks
FROM alpine:latest FROM alpine:latest
LABEL org.opencontainers.image.source="https://github.com/xjasonlyu/tun2socks" LABEL org.opencontainers.image.source="https://github.com/xjasonlyu/tun2socks"

56
Makefile
View File

@@ -1,17 +1,18 @@
BINARY = tun2socks BINARY := tun2socks
OUTPUT = bin MODULE := github.com/xjasonlyu/tun2socks
BUILD_FLAGS = -v BUILD_DIR := build
BUILD_TAGS = BUILD_TAGS :=
BUILD_COMMIT = $(shell git describe --dirty --always) BUILD_FLAGS := -v
BUILD_VERSION = $(shell git describe --abbrev=0 --tags HEAD) BUILD_COMMIT := $(shell git describe --dirty --always)
BUILD_VERSION := $(shell git describe --abbrev=0 --tags HEAD)
CGO_ENABLED = 0 CGO_ENABLED := 0
GO111MODULE = on GO111MODULE := on
LDFLAGS += -w -s -buildid= LDFLAGS += -w -s -buildid=
LDFLAGS += -X "github.com/xjasonlyu/tun2socks/constant.Version=$(BUILD_VERSION)" LDFLAGS += -X "$(MODULE)/constant.Version=$(BUILD_VERSION)"
LDFLAGS += -X "github.com/xjasonlyu/tun2socks/constant.GitCommit=$(BUILD_COMMIT)" LDFLAGS += -X "$(MODULE)/constant.GitCommit=$(BUILD_COMMIT)"
GO_BUILD = GO111MODULE=$(GO111MODULE) CGO_ENABLED=$(CGO_ENABLED) \ GO_BUILD = GO111MODULE=$(GO111MODULE) CGO_ENABLED=$(CGO_ENABLED) \
go build $(BUILD_FLAGS) -ldflags '$(LDFLAGS)' -tags '$(BUILD_TAGS)' -trimpath go build $(BUILD_FLAGS) -ldflags '$(LDFLAGS)' -tags '$(BUILD_TAGS)' -trimpath
@@ -24,52 +25,45 @@ PLATFORM_LIST = \
linux-arm64 \ linux-arm64 \
openbsd-amd64 \ openbsd-amd64 \
openbsd-arm64 \ openbsd-arm64 \
WINDOWS_ARCH_LIST = \
windows-amd64 \ windows-amd64 \
all: linux-amd64 darwin-amd64 windows-amd64 all: linux-amd64 darwin-amd64 windows-amd64
tun2socks: tun2socks:
$(GO_BUILD) -o $(OUTPUT)/$(BINARY) $(GO_BUILD) -o $(BUILD_DIR)/$(BINARY)
darwin-amd64: darwin-amd64:
GOARCH=amd64 GOOS=darwin $(GO_BUILD) -o $(OUTPUT)/$(BINARY)-$@ GOARCH=amd64 GOOS=darwin $(GO_BUILD) -o $(BUILD_DIR)/$(BINARY)-$@
freebsd-amd64: freebsd-amd64:
GOARCH=amd64 GOOS=freebsd $(GO_BUILD) -o $(OUTPUT)/$(BINARY)-$@ GOARCH=amd64 GOOS=freebsd $(GO_BUILD) -o $(BUILD_DIR)/$(BINARY)-$@
freebsd-arm64: freebsd-arm64:
GOARCH=arm64 GOOS=freebsd $(GO_BUILD) -o $(OUTPUT)/$(BINARY)-$@ GOARCH=arm64 GOOS=freebsd $(GO_BUILD) -o $(BUILD_DIR)/$(BINARY)-$@
linux-amd64: linux-amd64:
GOARCH=amd64 GOOS=linux $(GO_BUILD) -o $(OUTPUT)/$(BINARY)-$@ GOARCH=amd64 GOOS=linux $(GO_BUILD) -o $(BUILD_DIR)/$(BINARY)-$@
linux-arm64: linux-arm64:
GOARCH=arm64 GOOS=linux $(GO_BUILD) -o $(OUTPUT)/$(BINARY)-$@ GOARCH=arm64 GOOS=linux $(GO_BUILD) -o $(BUILD_DIR)/$(BINARY)-$@
openbsd-amd64: openbsd-amd64:
GOARCH=amd64 GOOS=openbsd $(GO_BUILD) -o $(OUTPUT)/$(BINARY)-$@ GOARCH=amd64 GOOS=openbsd $(GO_BUILD) -o $(BUILD_DIR)/$(BINARY)-$@
openbsd-arm64: openbsd-arm64:
GOARCH=arm64 GOOS=openbsd $(GO_BUILD) -o $(OUTPUT)/$(BINARY)-$@ GOARCH=arm64 GOOS=openbsd $(GO_BUILD) -o $(BUILD_DIR)/$(BINARY)-$@
windows-amd64: windows-amd64:
GOARCH=amd64 GOOS=windows $(GO_BUILD) -o $(OUTPUT)/$(BINARY)-$@.exe GOARCH=amd64 GOOS=windows $(GO_BUILD) -o $(BUILD_DIR)/$(BINARY)-$@.exe
gz_releases=$(addsuffix .gz, $(PLATFORM_LIST)) zip_releases := $(addsuffix .zip, $(PLATFORM_LIST))
zip_releases=$(addsuffix .zip, $(WINDOWS_ARCH_LIST))
$(gz_releases): %.gz : %
chmod +x $(OUTPUT)/$(BINARY)-$(basename $@)
gzip -f -S .gz $(OUTPUT)/$(BINARY)-$(basename $@)
$(zip_releases): %.zip: % $(zip_releases): %.zip: %
zip -m -j $(OUTPUT)/$(BINARY)-$(basename $@).zip $(OUTPUT)/$(BINARY)-$(basename $@).exe @zip -m -j $(BUILD_DIR)/$(BINARY)-$(basename $@).zip $(BUILD_DIR)/$(BINARY)-$(basename $@)*
all-arch: $(PLATFORM_LIST) $(WINDOWS_ARCH_LIST) all-arch: $(PLATFORM_LIST)
releases: $(gz_releases) $(zip_releases) releases: $(zip_releases)
clean: clean:
rm $(OUTPUT)/* rm -rf $(BUILD_DIR)