From 6cf638de2b60a29d3f90ee2ba8da19ae983663e5 Mon Sep 17 00:00:00 2001
From: Toby <tobyxdd@gmail.com>
Date: Sun, 8 Aug 2021 10:39:26 -0700
Subject: [PATCH] tun & non-tun versions

---
 .github/workflows/release-tun.yml | 58 +++++++++++++++++++++++++++++++
 .github/workflows/release.yml     | 25 +++++++------
 2 files changed, 70 insertions(+), 13 deletions(-)
 create mode 100644 .github/workflows/release-tun.yml

diff --git a/.github/workflows/release-tun.yml b/.github/workflows/release-tun.yml
new file mode 100644
index 0000000..de7d88a
--- /dev/null
+++ b/.github/workflows/release-tun.yml
@@ -0,0 +1,58 @@
+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.3.4
+
+      - 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-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
+
+      - name: Upload
+        uses: meeDamian/github-release@v2.0.3
+        with:
+          token: ${{ secrets.GITHUB_TOKEN }}
+          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
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index e3cc85a..810bf5d 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -27,17 +27,17 @@ jobs:
         id: current-time
 
       - name: Build
-        uses: crazy-max/ghaction-xgo@v1.6.1
+        uses: tobyxdd/go-cross-build@25e1ba1da2fb42ed9787b615f0e89235569c58fa
         env:
           TIME: "${{ steps.current-time.outputs.time }}"
+          CGO_ENABLED: "0"
         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
+          name: hysteria
+          dest: ./dist/
           ldflags: -w -s -X main.appVersion=${{ env.GIT_TAG_NAME }} -X main.appCommit=${{ github.sha }} -X main.appDate=${{ env.TIME }}
-          pkg: cmd
+          platforms: 'linux/amd64, linux/386, linux/arm, linux/arm64, linux/mipsle, darwin/amd64, darwin/arm64, windows/amd64, windows/386'
+          package: ./cmd
+          compress: false
 
       - name: Upload
         uses: meeDamian/github-release@v2.0.3
@@ -48,11 +48,10 @@ jobs:
           files: >
             ./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-darwin-amd64
+            ./dist/hysteria-darwin-arm64
+            ./dist/hysteria-windows-amd64.exe
+            ./dist/hysteria-windows-386.exe
\ No newline at end of file