perf: change build

Author: ibuler

.github/workflows/build.yml

@@ -25,28 +25,58 @@ env:
   CSC_KEY_PASSWORD: ${{ secrets.CSC_KEY_PASSWORD }}
 
 jobs:
+  pre-build:
+    name: pre-build go client
+    runs-on: ubuntu-latest
+    outputs:
+      go-client-artifacts: ${{ steps.upload-go-client.outputs.artifact-name }}
+    
+    steps:
+      - name: Check out git repository
+        uses: actions/checkout@v4
+
+      - name: Setup Go
+        uses: actions/setup-go@v4
+        with:
+          go-version: '1.21'
+
+      - name: Build Go client for all platforms
+        run: make build-all
+        working-directory: go-client
+
+      - name: Upload Go client artifacts
+        id: upload-go-client
+        uses: actions/upload-artifact@v4
+        with:
+          name: go-client-binaries
+          path: go-client/build/
+          retention-days: 1
+
   build:
     name: build tauri app
     runs-on: ${{ matrix.os }}
+    needs: pre-build
 
     strategy:
       fail-fast: false
       matrix:
-        os: [macos-14, windows-latest]
+        os: [macos-14, windows-latest, ubuntu-latest]
 
     steps:
       - name: Check out git repository
         uses: actions/checkout@v4
 
+      - name: Download Go client artifacts
+        uses: actions/download-artifact@v4
+        with:
+          name: go-client-binaries
+          path: go-client/build/
+
       - name: Setup Go
         uses: actions/setup-go@v4
         with:
           go-version: '1.21'
 
-      - name: Build Go client
-        run: make build-client
-        working-directory: go-client
-
       - name: Setup pnpm
         uses: pnpm/action-setup@v4
 
@@ -135,7 +165,7 @@ jobs:
   release:
     name: create release
     runs-on: ubuntu-latest
-    needs: build
+    needs: [pre-build, build]
     if: startsWith(github.ref, 'refs/tags/')
 
     steps:

go-client/Makefile

@@ -25,7 +25,7 @@ build-current:
 	@mkdir -p $(BUILDDIR)/$(CURRENT_OS)-$(CURRENT_ARCH)
 	@if [ "$(CURRENT_OS)" = "windows" ]; then \
 		$(CLIENTBUILD) -ldflags "$(LDFLAGS) -H windowsgui" -o $(BUILDDIR)/$(CURRENT_OS)-$(CURRENT_ARCH)/JumpServerClient.exe $(CLIENTSRCFILE); \
-		$(CLIENTBUILD) -ldflags "$(LDFLAGS)" -o $(BUILDDIR)/$(CURRENT_OS)-$(CURRENT_ARCH)/client.exe $(SSHCSRCFILE); \
+		echo "Skipping sshc build on Windows (not supported)"; \
 	else \
 		$(CLIENTBUILD) -ldflags "$(LDFLAGS)" -o $(BUILDDIR)/$(CURRENT_OS)-$(CURRENT_ARCH)/JumpServerClient $(CLIENTSRCFILE); \
 		$(CLIENTBUILD) -ldflags "$(LDFLAGS)" -o $(BUILDDIR)/$(CURRENT_OS)-$(CURRENT_ARCH)/client $(SSHCSRCFILE); \
@@ -41,32 +41,47 @@ build-current:
 		cp $(BASEPATH)/pkg/autoit/*.dll $(BASEPATH)/../src-tauri/resources/bin/windows/; \
 	fi
 
-# 构建所有平台
+# 构建所有平台 - 优化版本：在一个任务中构建所有目标
 .PHONY: build-all
 build-all:
+	@echo "Building all platforms in one task..."
+	@rm -rf $(BUILDDIR)
+	@mkdir -p $(BUILDDIR)/{darwin-amd64,darwin-arm64,linux-amd64,linux-arm64,windows}
+	
+	@echo "Building Darwin AMD64..."
 	GOARCH=amd64 GOOS=darwin $(CLIENTBUILD) -ldflags "$(LDFLAGS)" -o $(BUILDDIR)/darwin-amd64/JumpServerClient $(CLIENTSRCFILE)
 	GOARCH=amd64 GOOS=darwin $(CLIENTBUILD) -ldflags "$(LDFLAGS)" -o $(BUILDDIR)/darwin-amd64/client $(SSHCSRCFILE)
-
+	
+	@echo "Building Darwin ARM64..."
 	GOARCH=arm64 GOOS=darwin $(CLIENTBUILD) -ldflags "$(LDFLAGS)" -o $(BUILDDIR)/darwin-arm64/JumpServerClient $(CLIENTSRCFILE)
 	GOARCH=arm64 GOOS=darwin $(CLIENTBUILD) -ldflags "$(LDFLAGS)" -o $(BUILDDIR)/darwin-arm64/client $(SSHCSRCFILE)
-
-	GOARCH=amd64 GOOS=windows $(CLIENTBUILD) -ldflags "$(LDFLAGS) -H windowsgui" -o $(BUILDDIR)/windows/JumpServerClient.exe $(CLIENTSRCFILE)
-	GOARCH=386 GOOS=windows $(CLIENTBUILD) -ldflags "$(LDFLAGS) -H windowsgui" -o $(BUILDDIR)/windows/JumpServerClient32.exe $(CLIENTSRCFILE)
-
+	
+	@echo "Building Linux AMD64..."
 	GOARCH=amd64 GOOS=linux $(CLIENTBUILD) -ldflags "$(LDFLAGS)" -o $(BUILDDIR)/linux-amd64/JumpServerClient $(CLIENTSRCFILE)
 	GOARCH=amd64 GOOS=linux $(CLIENTBUILD) -ldflags "$(LDFLAGS)" -o $(BUILDDIR)/linux-amd64/client $(SSHCSRCFILE)
-
+	
+	@echo "Building Linux ARM64..."
 	GOARCH=arm64 GOOS=linux $(CLIENTBUILD) -ldflags "$(LDFLAGS)" -o $(BUILDDIR)/linux-arm64/JumpServerClient $(CLIENTSRCFILE)
 	GOARCH=arm64 GOOS=linux $(CLIENTBUILD) -ldflags "$(LDFLAGS)" -o $(BUILDDIR)/linux-arm64/client $(SSHCSRCFILE)
-
-	mkdir -p $(BASEPATH)/../src-tauri/resources/bin/
-
-	cp -R $(BASEPATH)/Scripts $(BUILDDIR)/darwin-amd64/
-	cp -R $(BASEPATH)/Scripts $(BUILDDIR)/darwin-arm64/
-	cp -R $(BUILDDIR)/* $(BASEPATH)/../src-tauri/resources/bin/
-	cp $(BASEPATH)/config.json $(BASEPATH)/../src-tauri/resources/bin/
-	cp $(BASEPATH)/putty.exe $(BASEPATH)/../src-tauri/resources/bin/windows/
-	cp $(BASEPATH)/pkg/autoit/*.dll $(BASEPATH)/../src-tauri/resources/bin/windows/
+	
+	@echo "Building Windows AMD64..."
+	GOARCH=amd64 GOOS=windows $(CLIENTBUILD) -ldflags "$(LDFLAGS) -H windowsgui" -o $(BUILDDIR)/windows/JumpServerClient.exe $(CLIENTSRCFILE)
+	
+	@echo "Building Windows 386..."
+	GOARCH=386 GOOS=windows $(CLIENTBUILD) -ldflags "$(LDFLAGS) -H windowsgui" -o $(BUILDDIR)/windows/JumpServerClient32.exe $(CLIENTSRCFILE)
+	
+	@echo "Copying platform-specific resources..."
+	@cp -R $(BASEPATH)/Scripts $(BUILDDIR)/darwin-amd64/
+	@cp -R $(BASEPATH)/Scripts $(BUILDDIR)/darwin-arm64/
+	@cp $(BASEPATH)/putty.exe $(BUILDDIR)/windows/
+	@cp $(BASEPATH)/pkg/autoit/*.dll $(BUILDDIR)/windows/
+	
+	@echo "Copying to Tauri resources..."
+	@mkdir -p $(BASEPATH)/../src-tauri/resources/bin/
+	@cp -R $(BUILDDIR)/* $(BASEPATH)/../src-tauri/resources/bin/
+	@cp $(BASEPATH)/config.json $(BASEPATH)/../src-tauri/resources/bin/
+	
+	@echo "Build completed for all platforms!"
 
 # 帮助信息
 .PHONY: help