From 33901413bf194a1081ed94c6ecd7519e2cf12fa0 Mon Sep 17 00:00:00 2001 From: Toby Date: Tue, 4 Jan 2022 19:08:51 -0800 Subject: [PATCH] chore: tun/notun swap --- .github/workflows/release.yml | 32 ++++++++++++++++---------------- README.md | 7 ++++--- README.zh.md | 5 +++-- 3 files changed, 23 insertions(+), 21 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 1900e0bd22..d1cd9ef64b 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -26,7 +26,7 @@ jobs: uses: gerred/actions/current-time@master id: current-time - - name: Build + - name: Build (tun) uses: crazy-max/ghaction-xgo@v1.6.1 env: TIME: "${{ steps.current-time.outputs.time }}" @@ -34,7 +34,7 @@ jobs: xgo_version: latest go_version: 1.17 dest: dist - prefix: hysteria + prefix: hysteria-tun targets: linux/amd64,linux/386,linux/arm-5,linux/arm-7,linux/arm64,linux/mipsle,darwin-10.12/amd64,darwin-10.12/arm64,windows-6.0/amd64,windows-6.0/386 ldflags: -w -s -X main.appVersion=${{ env.GIT_TAG_NAME }} -X main.appCommit=${{ github.sha }} -X main.appDate=${{ env.TIME }} pkg: cmd @@ -45,11 +45,11 @@ jobs: TIME: "${{ steps.current-time.outputs.time }}" CGO_ENABLED: "0" with: - name: hysteria-notun - dest: ./dist/ + name: hysteria + dest: dist ldflags: -w -s -X main.appVersion=${{ env.GIT_TAG_NAME }} -X main.appCommit=${{ github.sha }} -X main.appDate=${{ env.TIME }} platforms: 'linux/amd64, linux/386, linux/arm, linux/arm64, linux/mipsle' - package: ./cmd + package: cmd compress: false - name: Upload @@ -57,18 +57,18 @@ jobs: if: startsWith(github.ref, 'refs/tags/') with: files: | + ./dist/hysteria-tun-linux-amd64 + ./dist/hysteria-tun-linux-386 + ./dist/hysteria-tun-linux-arm-5 + ./dist/hysteria-tun-linux-arm-7 + ./dist/hysteria-tun-linux-arm64 + ./dist/hysteria-tun-linux-mipsle + ./dist/hysteria-tun-darwin-10.12-amd64 + ./dist/hysteria-tun-darwin-10.12-arm64 + ./dist/hysteria-tun-windows-6.0-amd64.exe + ./dist/hysteria-tun-windows-6.0-386.exe ./dist/hysteria-linux-amd64 ./dist/hysteria-linux-386 - ./dist/hysteria-linux-arm-5 - ./dist/hysteria-linux-arm-7 + ./dist/hysteria-linux-arm ./dist/hysteria-linux-arm64 ./dist/hysteria-linux-mipsle - ./dist/hysteria-darwin-10.12-amd64 - ./dist/hysteria-darwin-10.12-arm64 - ./dist/hysteria-windows-6.0-amd64.exe - ./dist/hysteria-windows-6.0-386.exe - ./dist/hysteria-notun-linux-amd64 - ./dist/hysteria-notun-linux-386 - ./dist/hysteria-notun-linux-arm - ./dist/hysteria-notun-linux-arm64 - ./dist/hysteria-notun-linux-mipsle diff --git a/README.md b/README.md index 0291d7800f..411a658a61 100644 --- a/README.md +++ b/README.md @@ -31,9 +31,10 @@ currently has the following features: (still growing!) ### Windows, Linux, macOS CLI - Download pre-built binaries from https://github.com/tobyxdd/hysteria/releases - - Linux builds are available as `hysteria` (with tun support) and `hysteria-notun` (without tun support). Builds - without tun support are statically linked and do not depend on glibc. **If you use a non-standard distribution that - can't run `hysteria` properly, try `hysteria-notun` instead.** + - Linux builds are available as `hysteria-tun` (with tun support) and `hysteria` (without tun support). Builds + without tun support are statically linked and do not depend on glibc. **If you use a Linux distribution that + can't run `hysteria-tun` properly, try `hysteria-notun` instead.** + - Other platforms do not have glibc compatibility issues. The builds are all with tun support. - Use Docker or Docker Compose: https://github.com/HyNetwork/hysteria/blob/master/Docker.md - Use our Arch Linux AUR: https://aur.archlinux.org/packages/hysteria/ - Build from source with `go build ./cmd` diff --git a/README.zh.md b/README.zh.md index d812b28a91..638c397005 100644 --- a/README.zh.md +++ b/README.zh.md @@ -28,8 +28,9 @@ Hysteria 是一个功能丰富的，专为恶劣网络环境进行优化的网 ### Windows, Linux, macOS CLI - 从 https://github.com/tobyxdd/hysteria/releases 下载编译好的版本 - - Linux 分为 `hysteria` (带有 tun 支持) 和 `hysteria-notun` (无 tun 支持) 两个版本。无 tun 支持的版本是静态链接，不依赖系统 - glibc 的。**如果你使用了非标准 Linux 发行版，无法正常执行 `hysteria`，可尝试 `hysteria-notun`** + - Linux 分为 `hysteria-tun` (带有 tun 支持) 和 `hysteria` (无 tun 支持) 两个版本。无 tun 支持的版本是静态链接，不依赖系统 + glibc 的。**如果你使用的 Linux 发行版无法正常执行 `hysteria-tun`，请尝试 `hysteria`** + - 其余平台无 glibc 兼容性问题，提供的都是带有 tun 支持的版本 - 使用 Docker 或 Docker Compose: https://github.com/HyNetwork/hysteria/blob/master/Docker.zh.md - 使用 Arch Linux AUR: https://aur.archlinux.org/packages/hysteria/ - 自己用 `go build ./cmd` 从源码编译