Skip to content

Commit

Permalink
Better build naming & notun README
Browse files Browse the repository at this point in the history
  • Loading branch information
tobyxdd committed Aug 8, 2021
1 parent 837ead2 commit 481abdf
Show file tree
Hide file tree
Showing 4 changed files with 22 additions and 17 deletions.
22 changes: 11 additions & 11 deletions .github/workflows/release-tun.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ jobs:
xgo_version: latest
go_version: latest
dest: dist
prefix: hysteria-tun
prefix: hysteria
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
Expand All @@ -46,13 +46,13 @@ jobs:
gzip: false
allow_override: true
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-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
12 changes: 6 additions & 6 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ jobs:
TIME: "${{ steps.current-time.outputs.time }}"
CGO_ENABLED: "0"
with:
name: hysteria
name: hysteria-notun
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, darwin/amd64, darwin/arm64, windows/amd64, windows/386'
Expand All @@ -46,8 +46,8 @@ jobs:
gzip: false
allow_override: true
files: >
./dist/hysteria-linux-amd64
./dist/hysteria-linux-386
./dist/hysteria-linux-arm
./dist/hysteria-linux-arm64
./dist/hysteria-linux-mipsle
./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
3 changes: 3 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,9 @@ 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.
- Pull the image from Docker Hub: https://hub.docker.com/r/tobyxdd/hysteria
- Use our Arch Linux AUR: https://aur.archlinux.org/packages/hysteria/
- Build from source with `go build ./cmd`
Expand Down
2 changes: 2 additions & 0 deletions README.zh.md
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,8 @@ Hysteria 是一个功能丰富的,专为恶劣网络环境进行优化的网
### Windows, Linux, macOS CLI

-https://github.com/tobyxdd/hysteria/releases 下载编译好的版本
- Linux 分为 `hysteria` (带有 tun 支持) 和 `hysteria-notun` (无 tun 支持) 两个版本。无 tun 支持的版本是静态链接,不依赖系统
glibc 的。如果你使用了非标准 Linux 发行版,无法正常执行 `hysteria`,可尝试 `hysteria-notun`
- Docker 镜像: https://hub.docker.com/r/tobyxdd/hysteria
- 使用 Arch Linux AUR: https://aur.archlinux.org/packages/hysteria/
- 自己用 `go build ./cmd` 从源码编译
Expand Down

0 comments on commit 481abdf

Please sign in to comment.