Skip to content

Commit

Permalink
chore: merge tun & notun build
Browse files Browse the repository at this point in the history
  • Loading branch information
tobyxdd committed Jan 5, 2022
1 parent dbff764 commit 233c434
Show file tree
Hide file tree
Showing 3 changed files with 25 additions and 58 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build-master.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ jobs:
TIME: "${{ steps.current-time.outputs.time }}"
with:
xgo_version: latest
go_version: latest
go_version: 1.17
dest: dist
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
Expand Down
56 changes: 0 additions & 56 deletions .github/workflows/release-tun.yml

This file was deleted.

25 changes: 24 additions & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,19 @@ jobs:
id: current-time

- name: Build
uses: crazy-max/[email protected]
env:
TIME: "${{ steps.current-time.outputs.time }}"
with:
xgo_version: latest
go_version: 1.17
dest: dist
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

- name: Build (notun)
uses: tobyxdd/go-cross-build@25e1ba1da2fb42ed9787b615f0e89235569c58fa
env:
TIME: "${{ steps.current-time.outputs.time }}"
Expand All @@ -35,7 +48,7 @@ jobs:
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'
platforms: 'linux/amd64, linux/386, linux/arm, linux/arm64, linux/mipsle'
package: ./cmd
compress: false

Expand All @@ -44,6 +57,16 @@ jobs:
if: startsWith(github.ref, 'refs/tags/')
with:
files: |
./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
./dist/hysteria-notun-linux-amd64
./dist/hysteria-notun-linux-386
./dist/hysteria-notun-linux-arm
Expand Down

0 comments on commit 233c434

Please sign in to comment.