black-internet-days-ahead/sing-box
1
0
Fork 0
mirror of https://github.com/SagerNet/sing-box.git synced 2024-11-22 08:31:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

documentation: Fix description for with_ech

Browse source
This commit is contained in:
世界 2024-02-10 12:01:09 +08:00
parent d0f7a59e9b
commit 31b8834427
No known key found for this signature in database
GPG key ID: CD109927C34A63C4
5 changed files with 12 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.github/workflows/debug.yml vendored
View file

@ -72,7 +72,7 @@ jobs:
~/go/pkg/mod ~/go/pkg/mod
key: go120-${{ hashFiles('**/go.sum') }} key: go120-${{ hashFiles('**/go.sum') }}
- name: Run Test - name: Run Test
run: make ci_build run: make ci_build_go120
build_go121: build_go121:
name: Debug build (Go 1.21) name: Debug build (Go 1.21)
runs-on: ubuntu-latest runs-on: ubuntu-latest

1
.goreleaser.yaml
View file

@ -54,7 +54,6 @@ builds:
- with_quic - with_quic
- with_dhcp - with_dhcp
- with_wireguard - with_wireguard
- with_ech
- with_utls - with_utls
- with_reality_server - with_reality_server
- with_acme - with_acme

9
Makefile
View file

@ -1,8 +1,9 @@
NAME = sing-box NAME = sing-box
COMMIT = $(shell git rev-parse --short HEAD) COMMIT = $(shell git rev-parse --short HEAD)
TAGS_GO118 = with_gvisor,with_dhcp,with_wireguard,with_reality_server,with_clash_api TAGS_GO118 = with_gvisor,with_dhcp,with_wireguard,with_reality_server,with_clash_api
TAGS_GO120 = with_quic,with_ech,with_utls TAGS_GO120 = with_quic,with_utls
TAGS ?= $(TAGS_GO118),$(TAGS_GO120) 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 TAGS_TEST ?= with_gvisor,with_quic,with_wireguard,with_grpc,with_ech,with_utls,with_reality_server
GOHOSTOS = $(shell go env GOHOSTOS) GOHOSTOS = $(shell go env GOHOSTOS)
@ -23,6 +24,10 @@ ci_build_go118:
go build $(PARAMS) $(MAIN) go build $(PARAMS) $(MAIN)
go build $(PARAMS) -tags "$(TAGS_GO118)" $(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: ci_build:
go build $(PARAMS) $(MAIN) go build $(PARAMS) $(MAIN)
go build $(MAIN_PARAMS) $(MAIN) go build $(MAIN_PARAMS) $(MAIN)

3
docs/installation/build-from-source.md
View file

@ -23,7 +23,8 @@ Since sing-box 1.5.0:
Since sing-box 1.8.0: Since sing-box 1.8.0:
* Go 1.18.5 - ~ * 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. You can download and install Go from: https://go.dev/doc/install, latest version is recommended.

3
docs/installation/build-from-source.zh.md
View file

@ -23,7 +23,8 @@ sing-box 1.4.0 前:
从 sing-box 1.8.0: 从 sing-box 1.8.0:
* Go 1.18.5 - ~ * 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，推荐使用最新版本。 您可以从 https://go.dev/doc/install 下载并安装 Go，推荐使用最新版本。