From 067f3b5c6c137dae89f9a87a41cb44227dd7568d Mon Sep 17 00:00:00 2001 From: kovacs Date: Fri, 9 Dec 2022 14:20:48 +0800 Subject: [PATCH 1/2] =?UTF-8?q?chore(go-task):=20support=20freebsd?= =?UTF-8?q?=E3=80=81windows=20build?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit support freebsd、windows build Signed-off-by: kovacs --- .gitignore | 3 +- Taskfile.yaml | 107 ++++++++++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 106 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 04b3409..e226098 100644 --- a/.gitignore +++ b/.gitignore @@ -184,5 +184,6 @@ hy_linux .vscode /build/ +/dist/ -config*.json \ No newline at end of file +config*.json diff --git a/Taskfile.yaml b/Taskfile.yaml index 0d9c04b..5c70a72 100644 --- a/Taskfile.yaml +++ b/Taskfile.yaml @@ -5,19 +5,25 @@ tasks: cmds: - rm -rf dist - mkdir -p dist + hash: + dir: ./dist + cmds: + - sha256sum hysteria-* > hashes.txt build-hysteria: label: build-{{.TASK}} vars: + BUILD_VERSION: + sh: git describe --tags BUILD_COMMIT: sh: git rev-parse HEAD BUILD_DATE: - sh: date "+%Y%m%d%H%M%S" + sh: date -u '+%F %T' dir: ./app/cmd/ cmds: - | - GOOS={{.GOOS}} GOARCH={{.GOARCH}} GOARM={{.GOARM}} GOMIPS={{.GOMIPS}} \ + GOOS={{.GOOS}} GOARCH={{.GOARCH}} GOARM={{.GOARM}} GOAMD64={{.GOAMD64}} GOMIPS={{.GOMIPS}} \ go build -trimpath -o ../../dist/hysteria-{{.TASK}} -ldflags \ - "-w -s -X main.appCommit={{.BUILD_COMMIT}} -X main.appDate={{.BUILD_DATE}}" + "-w -s -X 'main.appVersion={{.BUILD_VERSION}}' -X 'main.appCommit={{.BUILD_COMMIT}}' -X 'main.appDate={{.BUILD_DATE}}'" linux-386: cmds: - task: build-hysteria @@ -129,6 +135,15 @@ tasks: GOOS: darwin, GOARCH: amd64 } + darwin-amd64-v3: + cmds: + - task: build-hysteria + vars: { + TASK: "{{.TASK}}", + GOOS: darwin, + GOARCH: amd64, + GOAMD64: v3 + } darwin-arm64: cmds: - task: build-hysteria @@ -137,6 +152,80 @@ tasks: GOOS: darwin, GOARCH: arm64 } + freebsd-386: + cmds: + - task: build-hysteria + vars: { + TASK: "{{.TASK}}", + GOOS: freebsd, + GOARCH: 386 + } + freebsd-amd64: + cmds: + - task: build-hysteria + vars: { + TASK: "{{.TASK}}", + GOOS: freebsd, + GOARCH: amd64 + } + freebsd-amd64-v3: + cmds: + - task: build-hysteria + vars: { + TASK: "{{.TASK}}", + GOOS: freebsd, + GOARCH: amd64, + GOAMD64: v3 + } + freebsd-arm: + cmds: + - task: build-hysteria + vars: { + TASK: "{{.TASK}}", + GOOS: freebsd, + GOARCH: arm + } + freebsd-arm64: + cmds: + - task: build-hysteria + vars: { + TASK: "{{.TASK}}", + GOOS: freebsd, + GOARCH: arm64 + } + windows-386: + cmds: + - task: build-hysteria + vars: { + TASK: "{{.TASK}}.exe", + GOOS: windows, + GOARCH: 386 + } + windows-amd64: + cmds: + - task: build-hysteria + vars: { + TASK: "{{.TASK}}.exe", + GOOS: freebsd, + GOARCH: amd64 + } + windows-amd64-v3: + cmds: + - task: build-hysteria + vars: { + TASK: "{{.TASK}}.exe", + GOOS: freebsd, + GOARCH: amd64, + GOAMD64: v3 + } + windows-arm64: + cmds: + - task: build-hysteria + vars: { + TASK: "{{.TASK}}.exe", + GOOS: freebsd, + GOARCH: arm64 + } default: cmds: - task: clean @@ -153,4 +242,16 @@ tasks: - task: linux-mips64 - task: linux-mips64le - task: darwin-amd64 + - task: darwin-amd64-v3 - task: darwin-arm64 + - task: freebsd-386 + - task: freebsd-amd64 + - task: freebsd-amd64-v3 + - task: freebsd-arm + - task: freebsd-arm64 + - task: windows-386 + - task: windows-amd64 + - task: windows-amd64-v3 + - task: windows-arm64 + - task: hash + From 01c3eef825544ab90b9233fb767bd323de824fd9 Mon Sep 17 00:00:00 2001 From: kovacs Date: Fri, 9 Dec 2022 14:37:53 +0800 Subject: [PATCH 2/2] chore(go-task): fix windows build, update amd64 v4 fix windows build, update amd64 v4 Signed-off-by: kovacs --- Taskfile.yaml | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/Taskfile.yaml b/Taskfile.yaml index 5c70a72..45fa61d 100644 --- a/Taskfile.yaml +++ b/Taskfile.yaml @@ -40,14 +40,14 @@ tasks: GOOS: linux, GOARCH: amd64 } - linux-amd64-v3: + linux-amd64-v4: cmds: - task: build-hysteria vars: { TASK: "{{.TASK}}", GOOS: linux, GOARCH: amd64, - GOAMD64: v3 + GOAMD64: v4 } linux-armv5: cmds: @@ -135,14 +135,14 @@ tasks: GOOS: darwin, GOARCH: amd64 } - darwin-amd64-v3: + darwin-amd64-v4: cmds: - task: build-hysteria vars: { TASK: "{{.TASK}}", GOOS: darwin, GOARCH: amd64, - GOAMD64: v3 + GOAMD64: v4 } darwin-arm64: cmds: @@ -168,14 +168,14 @@ tasks: GOOS: freebsd, GOARCH: amd64 } - freebsd-amd64-v3: + freebsd-amd64-v4: cmds: - task: build-hysteria vars: { TASK: "{{.TASK}}", GOOS: freebsd, GOARCH: amd64, - GOAMD64: v3 + GOAMD64: v4 } freebsd-arm: cmds: @@ -206,24 +206,24 @@ tasks: - task: build-hysteria vars: { TASK: "{{.TASK}}.exe", - GOOS: freebsd, + GOOS: windows, GOARCH: amd64 } - windows-amd64-v3: + windows-amd64-v4: cmds: - task: build-hysteria vars: { TASK: "{{.TASK}}.exe", - GOOS: freebsd, + GOOS: windows, GOARCH: amd64, - GOAMD64: v3 + GOAMD64: v4 } windows-arm64: cmds: - task: build-hysteria vars: { TASK: "{{.TASK}}.exe", - GOOS: freebsd, + GOOS: windows, GOARCH: arm64 } default: @@ -231,7 +231,7 @@ tasks: - task: clean - task: linux-386 - task: linux-amd64 - - task: linux-amd64-v3 + - task: linux-amd64-v4 - task: linux-armv5 - task: linux-armv6 - task: linux-armv7 @@ -242,16 +242,16 @@ tasks: - task: linux-mips64 - task: linux-mips64le - task: darwin-amd64 - - task: darwin-amd64-v3 + - task: darwin-amd64-v4 - task: darwin-arm64 - task: freebsd-386 - task: freebsd-amd64 - - task: freebsd-amd64-v3 + - task: freebsd-amd64-v4 - task: freebsd-arm - task: freebsd-arm64 - task: windows-386 - task: windows-amd64 - - task: windows-amd64-v3 + - task: windows-amd64-v4 - task: windows-arm64 - task: hash