Update build.yml

Author: byJoey

.github/workflows/build.yml

@@ -24,31 +24,64 @@ jobs:
             exe_ext: .exe
             archive_format: zip
             archive_ext: .zip
+            target: desktop
+            artifact_suffix: ""
+            enable_gui: true
+
           - os: macos-15-intel
             goos: darwin
             goarch: amd64
-            exe_ext: ''
+            exe_ext: ""
             archive_format: zip
             archive_ext: .zip
+            target: desktop
+            artifact_suffix: ""
+            enable_gui: true
+
           - os: macos-14
             goos: darwin
             goarch: arm64
-            exe_ext: ''
+            exe_ext: ""
             archive_format: zip
             archive_ext: .zip
+            target: desktop
+            artifact_suffix: ""
+            enable_gui: true
+
+          # Linux 桌面版（原来的）
           - os: ubuntu-latest
             goos: linux
             goarch: amd64
-            exe_ext: ''
+            exe_ext: ""
             archive_format: tar.gz
             archive_ext: .tar.gz
-          
+            target: desktop
+            artifact_suffix: ""
+            enable_gui: true
+            cgo_enabled: "1"
+
           - os: ubuntu-24.04-arm
             goos: linux
             goarch: arm64
-            exe_ext: ''
+            exe_ext: ""
+            archive_format: tar.gz
+            archive_ext: .tar.gz
+            target: desktop
+            artifact_suffix: ""
+            enable_gui: true
+            cgo_enabled: "1"
+
+          # ✅ 新增：Linux amd64 软路由版（OpenWrt / iStoreOS 等）
+          - os: ubuntu-latest
+            goos: linux
+            goarch: amd64
+            exe_ext: ""
             archive_format: tar.gz
             archive_ext: .tar.gz
+            target: softrouter
+            artifact_suffix: "-softrouter"
+            enable_gui: false   # 路由器上一般不跑 GUI
+            cgo_enabled: "0"    # 尽量静态，方便在各种 musl 系统上跑
 
     runs-on: ${{ matrix.os }}
 
@@ -68,25 +101,32 @@ jobs:
           go mod tidy
 
       - name: Build Go executable
+        env:
+          GOOS: ${{ matrix.goos }}
+          GOARCH: ${{ matrix.goarch }}
+          CGO_ENABLED: ${{ matrix.cgo_enabled || '1' }}
         run: |
-          GOOS=${{ matrix.goos }} GOARCH=${{ matrix.goarch }} go build -o ech-workers${{ matrix.exe_ext }} ech-workers.go
+          echo "Building for $GOOS/$GOARCH (target=${{ matrix.target }}, CGO_ENABLED=$CGO_ENABLED)"
+          go build -trimpath -ldflags="-s -w" -o ech-workers${{ matrix.exe_ext }} ech-workers.go
         shell: bash
 
+      # 下面这几个步骤：只有打 tag + 且当前目标允许 GUI 时才跑
+
       - name: Set up Python
-        if: startsWith(github.ref, 'refs/tags/')
+        if: startsWith(github.ref, 'refs/tags/') && matrix.enable_gui == true
         uses: actions/setup-python@v5
         with:
           python-version: '3.11'
 
       - name: Install system dependencies (Linux)
-        if: startsWith(github.ref, 'refs/tags/') && matrix.goos == 'linux'
+        if: startsWith(github.ref, 'refs/tags/') && matrix.goos == 'linux' && matrix.enable_gui == true
         run: |
           sudo apt-get update
           sudo apt-get install -y python3-pyqt5 python3-pyqt5.qtsvg python3-dev
         shell: bash
 
       - name: Install PyInstaller and dependencies
-        if: startsWith(github.ref, 'refs/tags/')
+        if: startsWith(github.ref, 'refs/tags/') && matrix.enable_gui == true
         run: |
           python -m pip install --upgrade pip
           if [ "${{ matrix.goos }}" == "linux" ]; then
@@ -101,23 +141,18 @@ jobs:
         shell: bash
 
       - name: Build Python executable
-        if: startsWith(github.ref, 'refs/tags/')
+        if: startsWith(github.ref, 'refs/tags/') && matrix.enable_gui == true
         run: |
-          # PyInstaller 会自动使用当前系统架构
-          # macos-13 = Intel (x86_64), macos-14 = Apple Silicon (arm64)
-          # ubuntu-latest = x86_64, ubuntu-latest-arm64 = ARM64
           if [ "${{ matrix.goos }}" == "windows" ]; then
             pyinstaller --onefile --windowed --name ECHWorkersGUI gui.py
           elif [ "${{ matrix.goos }}" == "linux" ]; then
-            # Linux: 检查 PyQt5 是否可用
             if python -c "import PyQt5.QtWidgets" 2>/dev/null; then
               pyinstaller --onefile --name ECHWorkersGUI gui.py
             else
               echo "PyQt5 not available, skipping GUI build for Linux"
               echo "Only Go executable will be included"
             fi
           else
-            # macOS 不需要 --windowed（会隐藏控制台）
             pyinstaller --onefile --name ECHWorkersGUI gui.py
           fi
         shell: bash
@@ -130,56 +165,68 @@ jobs:
           # 复制 Go 可执行文件
           cp ech-workers${{ matrix.exe_ext }} release/
           
-          # 复制 Python 打包后的可执行文件
-          if [ "${{ matrix.goos }}" == "windows" ]; then
-            if [ -f "dist/ECHWorkersGUI.exe" ]; then
-              cp dist/ECHWorkersGUI.exe release/
-            fi
-          else
-            if [ -f "dist/ECHWorkersGUI" ]; then
-              cp dist/ECHWorkersGUI release/
-              chmod +x release/ECHWorkersGUI
-            elif [ "${{ matrix.goos }}" == "linux" ]; then
-              echo "GUI executable not built, only Go executable will be included"
+          # 复制 Python 打包后的可执行文件（仅桌面版）
+          if [ "${{ matrix.enable_gui }}" = "true" ]; then
+            if [ "${{ matrix.goos }}" == "windows" ]; then
+              if [ -f "dist/ECHWorkersGUI.exe" ]; then
+                cp dist/ECHWorkersGUI.exe release/
+              fi
+            else
+              if [ -f "dist/ECHWorkersGUI" ]; then
+                cp dist/ECHWorkersGUI release/
+                chmod +x release/ECHWorkersGUI
+              elif [ "${{ matrix.goos }}" == "linux" ]; then
+                echo "GUI executable not built, only Go executable will be included"
+              fi
             fi
           fi
           
           # 创建 README
           {
             echo "ECH Workers Client"
             echo ""
+            echo "Target: ${{ matrix.target }}"
+            echo ""
             echo "Files:"
-            echo "- ech-workers(.exe): Go compiled core proxy program"
-            if [ "${{ matrix.goos }}" == "windows" ]; then
-              echo "- ECHWorkersGUI.exe: Python GUI client (standalone executable)"
-            elif [ "${{ matrix.goos }}" == "linux" ]; then
-              if [ -f "release/ECHWorkersGUI" ]; then
+            echo "- ech-workers${{ matrix.exe_ext }}: Go compiled core proxy program"
+            if [ "${{ matrix.enable_gui }}" = "true" ]; then
+              if [ "${{ matrix.goos }}" == "windows" ]; then
+                echo "- ECHWorkersGUI.exe: Python GUI client (standalone executable)"
+              elif [ -f "release/ECHWorkersGUI" ]; then
                 echo "- ECHWorkersGUI: Python GUI client (standalone executable)"
               else
                 echo "- Note: GUI client not available for this architecture"
                 echo "  Use ech-workers from command line instead"
               fi
             else
-              echo "- ECHWorkersGUI: Python GUI client (standalone executable)"
+              echo "- GUI client not included for this build (CLI only, suitable for routers / servers)"
             fi
             echo ""
             echo "Usage:"
             if [ "${{ matrix.goos }}" == "windows" ]; then
-              echo "1. Double-click ECHWorkersGUI.exe to launch the GUI"
+              echo "1. Double-click ECHWorkersGUI.exe to launch the GUI (if present)"
               echo "2. Or run ech-workers.exe from command line"
             else
-              echo "1. Run ./ECHWorkersGUI to launch the GUI"
-              echo "2. Or run ./ech-workers from command line"
+              echo "1. Run ./ech-workers from command line"
+              if [ "${{ matrix.enable_gui }}" = "true" ]; then
+                echo "2. Or run ./ECHWorkersGUI to launch the GUI"
+              fi
             fi
             echo ""
             echo "System Requirements:"
-            if [ "${{ matrix.goos }}" == "windows" ]; then
-              echo "- Windows: Windows 10+"
-            elif [ "${{ matrix.goos }}" == "darwin" ]; then
-              echo "- macOS: macOS 10.13+"
-            else
-              echo "- Linux: Ubuntu 18.04+ / Debian 10+ / CentOS 7+"
+            if [ "${{ matrix.target }}" = "softrouter" ]; then
+              echo "- Linux soft router / NAS (OpenWrt / iStoreOS / x86_64)"
               echo "- Architecture: ${{ matrix.goarch }}"
+              echo "- Recommended: run from SSH / shell"
+            else
+              if [ "${{ matrix.goos }}" == "windows" ]; then
+                echo "- Windows: Windows 10+"
+              elif [ "${{ matrix.goos }}" == "darwin" ]; then
+                echo "- macOS: macOS 10.13+"
+              else
+                echo "- Linux: Ubuntu 18.04+ / Debian 10+ / CentOS 7+"
+                echo "- Architecture: ${{ matrix.goarch }}"
+              fi
             fi
             echo "- No Python installation required (standalone executables)"
           } > release/README.txt
@@ -189,29 +236,29 @@ jobs:
         if: startsWith(github.ref, 'refs/tags/') && matrix.goos == 'windows'
         run: |
           cd release
-          powershell Compress-Archive -Path * -DestinationPath ../ECHWorkers-${{ matrix.goos }}-${{ matrix.goarch }}${{ matrix.archive_ext }} -Force
+          powershell Compress-Archive -Path * -DestinationPath ../ECHWorkers-${{ matrix.goos }}-${{ matrix.goarch }}${{ matrix.artifact_suffix }}${{ matrix.archive_ext }} -Force
         shell: powershell
 
       - name: Create archive (macOS)
         if: startsWith(github.ref, 'refs/tags/') && matrix.goos == 'darwin'
         run: |
           cd release
-          zip -r ../ECHWorkers-${{ matrix.goos }}-${{ matrix.goarch }}${{ matrix.archive_ext }} .
+          zip -r ../ECHWorkers-${{ matrix.goos }}-${{ matrix.goarch }}${{ matrix.artifact_suffix }}${{ matrix.archive_ext }} .
         shell: bash
 
       - name: Create archive (Linux)
         if: startsWith(github.ref, 'refs/tags/') && matrix.goos == 'linux'
         run: |
           cd release
-          tar -czf ../ECHWorkers-${{ matrix.goos }}-${{ matrix.goarch }}${{ matrix.archive_ext }} .
+          tar -czf ../ECHWorkers-${{ matrix.goos }}-${{ matrix.goarch }}${{ matrix.artifact_suffix }}${{ matrix.archive_ext }} .
         shell: bash
 
       - name: Upload artifacts
         if: startsWith(github.ref, 'refs/tags/')
         uses: actions/upload-artifact@v4
         with:
-          name: ECHWorkers-${{ matrix.goos }}-${{ matrix.goarch }}
-          path: ECHWorkers-${{ matrix.goos }}-${{ matrix.goarch }}${{ matrix.archive_ext }}
+          name: ECHWorkers-${{ matrix.goos }}-${{ matrix.goarch }}${{ matrix.artifact_suffix }}
+          path: ECHWorkers-${{ matrix.goos }}-${{ matrix.goarch }}${{ matrix.artifact_suffix }}${{ matrix.archive_ext }}
           retention-days: 30
 
   release: