perf: change build action

Author: ibuler

.github/workflows/build.yml

@@ -27,7 +27,7 @@ env:
 jobs:
   pre-build:
     name: pre-build go client
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     outputs:
       go-client-artifacts: ${{ steps.upload-go-client.outputs.artifact-name }}
 
@@ -61,16 +61,16 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - platform: "macos-latest" # for Arm based macs (M1 and above).
+          - os: "macos-latest" # for Arm based macs (M1 and above).
             args: "--target aarch64-apple-darwin"
-          - platform: "macos-latest" # for Intel based macs.
+          - os: "macos-latest" # for Intel based macs.
             args: "--target x86_64-apple-darwin"
-          - platform: "ubuntu-22.04" # for Tauri v1 you could replace this with ubuntu-20.04.
+          - os: "ubuntu-22.04" # for Tauri v1 you could replace this with ubuntu-20.04.
             args: ""
-          - platform: "windows-latest"
+          - os: "windows-latest"
             args: ""
 
-    runs-on: ${{ matrix.platform }}
+    runs-on: ${{ matrix.os }}
     steps:
       - name: Check out git repository
         uses: actions/checkout@v4
@@ -87,8 +87,6 @@ jobs:
 
       - uses: pnpm/action-setup@v4
         name: Install pnpm
-        with:
-          run_install: false
 
       - name: Setup Node.js
         uses: actions/setup-node@v4
@@ -100,42 +98,36 @@ jobs:
         uses: dtolnay/rust-toolchain@stable
         with:
           # Those targets are only used on macos runners so it's in an `if` to slightly speed up windows and linux builds.
-          targets: ${{ matrix.platform == 'macos-latest' && 'aarch64-apple-darwin,x86_64-apple-darwin' || '' }}
+          targets: ${{ matrix.os == 'macos-latest' && 'aarch64-apple-darwin,x86_64-apple-darwin' || '' }}
 
       - name: Install system dependencies (Ubuntu)
-        if: matrix.platform == 'ubuntu-22.04'
+        if: matrix.os == 'ubuntu-22.04'
         run: |
           sudo apt-get update
-          sudo apt-get install -y libwebkit2gtk-4.1-dev libssl-dev libgtk-3-dev libayatana-appindicator3-dev librsvg2-dev patchelf
+          sudo apt-get install -y libwebkit2gtk-4.0-dev libwebkit2gtk-4.1-dev libappindicator3-dev librsvg2-dev patchelf
 
       - name: Install frontend dependencies
         run: pnpm install
 
       - name: Build Tauri app
         uses: tauri-apps/tauri-action@v0
         env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          TAURI_PRIVATE_KEY: ${{ secrets.TAURI_PRIVATE_KEY }}
-          TAURI_KEY_PASSWORD: ${{ secrets.TAURI_KEY_PASSWORD }}
-          XCODE_APP_TEAM_ID: ${{ secrets.XCODE_APP_TEAM_ID }}
-          XCODE_APP_LOADER_EMAIL: ${{ secrets.XCODE_APP_LOADER_EMAIL }}
-          XCODE_APP_LOADER_PASSWORD: ${{ secrets.XCODE_APP_LOADER_PASSWORD }}
-          BUILD_CERTIFICATE_BASE64: ${{ secrets.CSC_LINK }}
-          P12_PASSWORD: ${{ secrets.CSC_KEY_PASSWORD }}
-          CSC_LINK: ${{ secrets.CSC_LINK }}
-          CSC_KEY_PASSWORD: ${{ secrets.CSC_KEY_PASSWORD }}
+          GITHUB_TOKEN: ${{ secrets.PRIVATE_TOKEN }}
         with:
+          args: ${{ matrix.args }}
           tagName: ${{ github.ref_name }}
           releaseName: "JumpServer Client v__VERSION__"
           releaseBody: "See the assets to download this version and install."
           releaseDraft: true
-          prerelease: false
+          prerelease: ${{ contains(github.ref_name, 'rc') || contains(github.ref_name, 'beta') || contains(github.ref_name, 'alpha') }}
 
   release:
     name: create latest.json
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     needs: [pre-build, build]
     if: startsWith(github.ref, 'refs/tags/')
+    permissions:
+      contents: write
 
     steps:
       - name: Check out git repository
@@ -172,4 +164,4 @@ jobs:
         with:
           files: latest.json
         env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          GITHUB_TOKEN: ${{ secrets.PRIVATE_TOKEN }}

go-client/Makefile

@@ -9,9 +9,15 @@ LDFLAGS=-w -s
 
 CLIENTBUILD=CGO_ENABLED=0 go build -trimpath
 
-# 自动检测当前平台
-CURRENT_OS := $(shell go env GOOS)
-CURRENT_ARCH := $(shell go env GOARCH)
+# 自动检测当前平台 - 使用 shell 命令，不依赖 Go 环境
+CURRENT_OS := $(shell uname -s 2>/dev/null | tr '[:upper:]' '[:lower:]' | sed 's/.*mingw.*/windows/; s/.*cygwin.*/windows/; s/.*msys.*/windows/' || echo "unknown")
+CURRENT_ARCH := $(shell uname -m 2>/dev/null | sed 's/x86_64/amd64/; s/aarch64/arm64/; s/arm64/arm64/; s/i686/386/' || echo "amd64")
+
+# Windows 环境变量检测（当 uname 不可用时）
+ifeq ($(OS),Windows_NT)
+CURRENT_OS := windows
+CURRENT_ARCH := amd64
+endif
 
 # 默认目标：构建并安装当前平台
 .PHONY: default
@@ -83,20 +89,34 @@ build-all:
 install:
 	@echo "Installing Go client for current platform: $(CURRENT_OS)/$(CURRENT_ARCH)"
 	@mkdir -p $(BASEPATH)/../src-tauri/resources/bin/
-	@if [ -d "$(BUILDDIR)/$(CURRENT_OS)-$(CURRENT_ARCH)" ]; then \
-		echo "Copying $(CURRENT_OS)-$(CURRENT_ARCH) files..."; \
-		cp -R $(BUILDDIR)/$(CURRENT_OS)-$(CURRENT_ARCH) $(BASEPATH)/../src-tauri/resources/bin/; \
-	elif [ "$(CURRENT_OS)" = "windows" ] && [ -d "$(BUILDDIR)/windows" ]; then \
-		echo "Copying Windows files..."; \
-		cp -R $(BUILDDIR)/windows $(BASEPATH)/../src-tauri/resources/bin/; \
+	@PLATFORM_DIR=""; \
+	if [ "$(CURRENT_OS)" = "darwin" ]; then \
+		if [ "$(CURRENT_ARCH)" = "arm64" ]; then \
+			PLATFORM_DIR="darwin-arm64"; \
+		else \
+			PLATFORM_DIR="darwin-amd64"; \
+		fi; \
+	elif [ "$(CURRENT_OS)" = "linux" ]; then \
+		if [ "$(CURRENT_ARCH)" = "arm64" ]; then \
+			PLATFORM_DIR="linux-arm64"; \
+		else \
+			PLATFORM_DIR="linux-amd64"; \
+		fi; \
+	elif [ "$(CURRENT_OS)" = "windows" ]; then \
+		PLATFORM_DIR="windows"; \
+	fi; \
+	echo "Looking for platform directory: $$PLATFORM_DIR"; \
+	if [ -d "$(BUILDDIR)/$$PLATFORM_DIR" ]; then \
+		echo "Copying $$PLATFORM_DIR files..."; \
+		cp -R $(BUILDDIR)/$$PLATFORM_DIR $(BASEPATH)/../src-tauri/resources/bin/; \
+		cp $(BASEPATH)/config.json $(BASEPATH)/../src-tauri/resources/bin/; \
+		echo "Install completed for $$PLATFORM_DIR!"; \
 	else \
-		echo "Error: No build files found for $(CURRENT_OS)/$(CURRENT_ARCH)"; \
+		echo "Error: No build files found for platform $$PLATFORM_DIR"; \
 		echo "Available platforms:"; \
 		ls -la $(BUILDDIR)/ 2>/dev/null || echo "No build directory found"; \
 		exit 1; \
 	fi
-	@cp $(BASEPATH)/config.json $(BASEPATH)/../src-tauri/resources/bin/
-	@echo "Install completed!"
 
 # 帮助信息
 .PHONY: help