From 31b88344276df3e26e3248240d05f2ce1380154b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=B8=96=E7=95=8C?= Date: Sat, 10 Feb 2024 12:01:09 +0800 Subject: [PATCH] documentation: Fix description for `with_ech` --- .github/workflows/debug.yml | 2 +- .goreleaser.yaml | 1 - Makefile | 9 +++++++-- docs/installation/build-from-source.md | 3 ++- docs/installation/build-from-source.zh.md | 3 ++- 5 files changed, 12 insertions(+), 6 deletions(-) diff --git a/.github/workflows/debug.yml b/.github/workflows/debug.yml index 5ccfc35b..50ea05d7 100644 --- a/.github/workflows/debug.yml +++ b/.github/workflows/debug.yml @@ -72,7 +72,7 @@ jobs: ~/go/pkg/mod key: go120-${{ hashFiles('**/go.sum') }} - name: Run Test - run: make ci_build + run: make ci_build_go120 build_go121: name: Debug build (Go 1.21) runs-on: ubuntu-latest diff --git a/.goreleaser.yaml b/.goreleaser.yaml index 2fe2e277..41578ab1 100644 --- a/.goreleaser.yaml +++ b/.goreleaser.yaml @@ -54,7 +54,6 @@ builds: - with_quic - with_dhcp - with_wireguard - - with_ech - with_utls - with_reality_server - with_acme diff --git a/Makefile b/Makefile index d2aa65d9..322f8f69 100644 --- a/Makefile +++ b/Makefile @@ -1,8 +1,9 @@ NAME = sing-box COMMIT = $(shell git rev-parse --short HEAD) TAGS_GO118 = with_gvisor,with_dhcp,with_wireguard,with_reality_server,with_clash_api -TAGS_GO120 = with_quic,with_ech,with_utls -TAGS ?= $(TAGS_GO118),$(TAGS_GO120) +TAGS_GO120 = with_quic,with_utls +TAGS_GO121 = with_ech +TAGS ?= $(TAGS_GO118),$(TAGS_GO120),$(TAGS_GO121) TAGS_TEST ?= with_gvisor,with_quic,with_wireguard,with_grpc,with_ech,with_utls,with_reality_server GOHOSTOS = $(shell go env GOHOSTOS) @@ -23,6 +24,10 @@ ci_build_go118: go build $(PARAMS) $(MAIN) go build $(PARAMS) -tags "$(TAGS_GO118)" $(MAIN) +ci_build_go120: + go build $(PARAMS) $(MAIN) + go build $(PARAMS) -tags "$(TAGS_GO118),$(TAGS_GO120)" $(MAIN) + ci_build: go build $(PARAMS) $(MAIN) go build $(MAIN_PARAMS) $(MAIN) diff --git a/docs/installation/build-from-source.md b/docs/installation/build-from-source.md index fc78d87f..d6c9a1ce 100644 --- a/docs/installation/build-from-source.md +++ b/docs/installation/build-from-source.md @@ -23,7 +23,8 @@ Since sing-box 1.5.0: Since sing-box 1.8.0: * Go 1.18.5 - ~ -* Go 1.20.0 - ~ with tag `with_quic`, `with_ech`, or `with_utls` enabled +* Go 1.20.0 - ~ with tag `with_quic`, or `with_utls` enabled +* Go 1.21.0 - ~ with tag `with_ech` enabled You can download and install Go from: https://go.dev/doc/install, latest version is recommended. diff --git a/docs/installation/build-from-source.zh.md b/docs/installation/build-from-source.zh.md index a1a09b93..dd9bfcc4 100644 --- a/docs/installation/build-from-source.zh.md +++ b/docs/installation/build-from-source.zh.md @@ -23,7 +23,8 @@ sing-box 1.4.0 前: 从 sing-box 1.8.0: * Go 1.18.5 - ~ -* Go 1.20.0 - ~ 如果启用构建标记 `with_quic`、`with_ech` 或 `with_utls` +* Go 1.20.0 - ~ 如果启用构建标记 `with_quic` 或 `with_utls` +* Go 1.20.1 - ~ 如果启用构建标记 `with_ech` 您可以从 https://go.dev/doc/install 下载并安装 Go,推荐使用最新版本。