From 233c434411818c3e9bfc72229766d277081c385f Mon Sep 17 00:00:00 2001
From: Toby <tobyxdd@gmail.com>
Date: Tue, 4 Jan 2022 18:42:36 -0800
Subject: [PATCH] chore: merge tun & notun build

---
 .github/workflows/build-master.yml |  2 +-
 .github/workflows/release-tun.yml  | 56 ------------------------------
 .github/workflows/release.yml      | 25 ++++++++++++-
 3 files changed, 25 insertions(+), 58 deletions(-)
 delete mode 100644 .github/workflows/release-tun.yml

diff --git a/.github/workflows/build-master.yml b/.github/workflows/build-master.yml
index 7c830c1..8355fae 100644
--- a/.github/workflows/build-master.yml
+++ b/.github/workflows/build-master.yml
@@ -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
diff --git a/.github/workflows/release-tun.yml b/.github/workflows/release-tun.yml
deleted file mode 100644
index 5d1c377..0000000
--- a/.github/workflows/release-tun.yml
+++ /dev/null
@@ -1,56 +0,0 @@
-name: Build and release (tun)
-
-on:
-  push:
-    tags:
-      - 'v*'
-
-jobs:
-
-  build:
-    name: Build and release (tun)
-    runs-on: ubuntu-latest
-    env:
-      ACTIONS_ALLOW_UNSECURE_COMMANDS: true
-
-    steps:
-
-      - name: Check out
-        uses: actions/checkout@v2.4.0
-
-      - name: Get tag
-        uses: olegtarasov/get-tag@v2
-        id: tagName
-
-      - name: Get time
-        uses: gerred/actions/current-time@master
-        id: current-time
-
-      - name: Build
-        uses: crazy-max/ghaction-xgo@v1.6.1
-        env:
-          TIME: "${{ steps.current-time.outputs.time }}"
-        with:
-          xgo_version: latest
-          go_version: latest
-          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: Upload
-        uses: softprops/action-gh-release@v1
-        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
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 46a9cba..1900e0b 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -27,6 +27,19 @@ jobs:
         id: current-time
 
       - name: Build
+        uses: crazy-max/ghaction-xgo@v1.6.1
+        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 }}"
@@ -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
 
@@ -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