From b1b1ab535043dc8418cbf2a02519a0192bd74873 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=B8=96=E7=95=8C?= Date: Sun, 21 Aug 2022 13:03:19 +0800 Subject: [PATCH] Update release config --- .goreleaser.yaml | 8 ++++---- Makefile | 15 +++++++++++++-- common/debugio/print.go | 19 +++++++++++++++++++ 3 files changed, 36 insertions(+), 6 deletions(-) create mode 100644 common/debugio/print.go diff --git a/.goreleaser.yaml b/.goreleaser.yaml index 3d89685c..48d01204 100644 --- a/.goreleaser.yaml +++ b/.goreleaser.yaml @@ -11,9 +11,10 @@ builds: ldflags: - -X github.com/sagernet/sing-box/constant.Commit={{ .ShortCommit }} -s -w -buildid= tags: - - with_clash_api - with_quic + - with_wireguard - with_acme + - with_clash_api env: - CGO_ENABLED=0 targets: @@ -40,8 +41,6 @@ archives: wrap_in_directory: true files: - LICENSE - - src: release/config/config.json - strip_parent: true name_template: '{{ .ProjectName }}-{{ .Version }}-{{ .Os }}-{{ .Arch }}{{ with .Arm }}v{{ . }}{{ end }}{{ with .Mips }}_{{ . }}{{ end }}{{ if not (eq .Amd64 "v1") }}{{ .Amd64 }}{{ end }}' nfpms: - id: package @@ -67,10 +66,11 @@ nfpms: - src: LICENSE dst: /usr/share/licenses/sing-box/LICENSE source: - enabled: true + enabled: false name_template: '{{ .ProjectName }}-{{ .Version }}.source' prefix_template: '{{ .ProjectName }}-{{ .Version }}/' checksum: + disable: true name_template: '{{ .ProjectName }}-{{ .Version }}.checksum' signs: - artifacts: checksum diff --git a/Makefile b/Makefile index 2c621610..a851be04 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ NAME = sing-box COMMIT = $(shell git rev-parse --short HEAD) -TAGS ?= with_quic,with_clash_api +TAGS ?= with_quic,with_wireguard,with_clash_api PARAMS = -v -trimpath -tags '$(TAGS)' -ldflags \ '-X "github.com/sagernet/sing-box/constant.Commit=$(COMMIT)" \ -w -s -buildid=' @@ -31,7 +31,18 @@ lint: GOOS=freebsd golangci-lint run ./... lint_install: - go install github.com/golangci/golangci-lint/cmd/golangci-lint@latest + go install -v github.com/golangci/golangci-lint/cmd/golangci-lint@latest + +snapshot: + goreleaser release --rm-dist --snapshot + mkdir dist/release + mv dist/*.tar.gz dist/*.zip dist/*.deb dist/*.rpm dist/release + ghr --delete --draft --prerelease -p 1 nightly dist/release + rm -r dist + +snapshot_install: + go install -v github.com/goreleaser/goreleaser@latest + go install -v github.com/tcnksm/ghr@latest test: @go test -v . && \ diff --git a/common/debugio/print.go b/common/debugio/print.go new file mode 100644 index 00000000..f29375bb --- /dev/null +++ b/common/debugio/print.go @@ -0,0 +1,19 @@ +package debugio + +import ( + "fmt" + "reflect" + + "github.com/sagernet/sing/common" +) + +func PrintUpstream(obj any) { + for obj != nil { + fmt.Println(reflect.TypeOf(obj)) + if u, ok := obj.(common.WithUpstream); !ok { + break + } else { + obj = u.Upstream() + } + } +}