diff --git a/.github/workflows/debug.yml b/.github/workflows/debug.yml index e5135443..812c40e6 100644 --- a/.github/workflows/debug.yml +++ b/.github/workflows/debug.yml @@ -62,7 +62,27 @@ jobs: ~/go/pkg/mod key: go118-${{ hashFiles('**/go.sum') }} - name: Run Test - run: make + run: make ci_build_go118 + build_go120: + name: Debug build (Go 1.20) + runs-on: ubuntu-latest + steps: + - name: Checkout + uses: actions/checkout@v3 + with: + fetch-depth: 0 + - name: Setup Go + uses: actions/setup-go@v4 + with: + go-version: 1.20.7 + - name: Cache go module + uses: actions/cache@v3 + with: + path: | + ~/go/pkg/mod + key: go118-${{ hashFiles('**/go.sum') }} + - name: Run Test + run: make ci_build cross: strategy: matrix: diff --git a/Makefile b/Makefile index d69247e0..50c04e2e 100644 --- a/Makefile +++ b/Makefile @@ -1,20 +1,30 @@ NAME = sing-box COMMIT = $(shell git rev-parse --short HEAD) -TAGS ?= with_gvisor,with_quic,with_dhcp,with_wireguard,with_utls,with_reality_server,with_clash_api +TAGS_GO118 = with_gvisor,with_dhcp,with_wireguard,with_utls,with_reality_server,with_clash_api +TAGS_GO120 ?= with_quic TAGS_TEST ?= with_gvisor,with_quic,with_wireguard,with_grpc,with_ech,with_utls,with_reality_server,with_shadowsocksr GOHOSTOS = $(shell go env GOHOSTOS) GOHOSTARCH = $(shell go env GOHOSTARCH) VERSION=$(shell CGO_ENABLED=0 GOOS=$(GOHOSTOS) GOARCH=$(GOHOSTARCH) go run ./cmd/internal/read_tag) -PARAMS = -v -trimpath -tags "$(TAGS)" -ldflags "-X 'github.com/sagernet/sing-box/constant.Version=$(VERSION)' -s -w -buildid=" +PARAMS = -v -trimpath -ldflags "-X 'github.com/sagernet/sing-box/constant.Version=$(VERSION)' -s -w -buildid=" +MAIN_PARAMS = $(PARAMS) -tags "$(TAGS_GO118),$(TAGS_GO120)" MAIN = ./cmd/sing-box PREFIX ?= $(shell go env GOPATH) .PHONY: test release build: + go build $(MAIN_PARAMS) $(MAIN) + +ci_build_go118: go build $(PARAMS) $(MAIN) + go build $(PARAMS) -tags "$(TAGS_GO118)" $(MAIN) + +ci_build: + go build $(PARAMS) $(MAIN) + go build $(MAIN_PARAMS) $(MAIN) install: go build -o $(PREFIX)/bin/$(NAME) $(PARAMS) $(MAIN) diff --git a/common/badtls/badtls_stub.go b/common/badtls/badtls_stub.go index 7810bb1c..2f0028f6 100644 --- a/common/badtls/badtls_stub.go +++ b/common/badtls/badtls_stub.go @@ -5,8 +5,10 @@ package badtls import ( "crypto/tls" "os" + + aTLS "github.com/sagernet/sing/common/tls" ) -func Create(conn *tls.Conn) (TLSConn, error) { +func Create(conn *tls.Conn) (aTLS.Conn, error) { return nil, os.ErrInvalid }