diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 2dfa4e15..efe52c23 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -72,6 +72,7 @@ jobs: preci-server: name: Build PreCI Server runs-on: ubuntu-latest + needs: codecc steps: - uses: actions/checkout@v4 - name: Set up Go @@ -98,6 +99,7 @@ jobs: preci-jetbrains-plugin: name: Build PreCI JetBrains Plugin runs-on: ubuntu-latest + needs: codecc steps: - uses: actions/checkout@v4 - name: Set up JDK 17 @@ -130,7 +132,7 @@ jobs: name: Release All runs-on: ubuntu-latest if: ${{ always() }} - needs: [codecc, preci-server, preci-jetbrains-plugin] + needs: [preci-server, preci-jetbrains-plugin] steps: - name: Create Release id: create_release @@ -170,7 +172,7 @@ jobs: with: upload_url: ${{ steps.create_release.outputs.upload_url }} asset_path: ./preci-server-dist/preci-${{ github.ref_name }}-win-amd64.zip - asset_name: preci-${{ github.ref_name }}-win-amd64.zip + asset_name: preci-win-amd64.zip asset_content_type: application/zip - name: Upload Release Asset -- PreCI Server (linux) uses: actions/upload-release-asset@v1 @@ -179,7 +181,7 @@ jobs: with: upload_url: ${{ steps.create_release.outputs.upload_url }} asset_path: ./preci-server-dist/preci-${{ github.ref_name }}-linux-amd64.zip - asset_name: preci-${{ github.ref_name }}-linux-amd64.zip + asset_name: preci-linux-amd64.zip asset_content_type: application/zip - name: Upload Release Asset -- PreCI Server (mac-amd64) uses: actions/upload-release-asset@v1 @@ -188,7 +190,7 @@ jobs: with: upload_url: ${{ steps.create_release.outputs.upload_url }} asset_path: ./preci-server-dist/preci-${{ github.ref_name }}-mac-amd64.zip - asset_name: preci-${{ github.ref_name }}-mac-amd64.zip + asset_name: preci-mac-amd64.zip asset_content_type: application/zip - name: Upload Release Asset -- PreCI Server (mac-arm64) uses: actions/upload-release-asset@v1 @@ -197,7 +199,7 @@ jobs: with: upload_url: ${{ steps.create_release.outputs.upload_url }} asset_path: ./preci-server-dist/preci-${{ github.ref_name }}-mac-arm64.zip - asset_name: preci-${{ github.ref_name }}-mac-arm64.zip + asset_name: preci-mac-arm64.zip asset_content_type: application/zip ## preci-jetbrains-plugin - name: download preci-jetbrains-plugin diff --git a/src/frontend/devops-codecc/package.json b/src/frontend/devops-codecc/package.json index 248337a6..91807e9d 100644 --- a/src/frontend/devops-codecc/package.json +++ b/src/frontend/devops-codecc/package.json @@ -19,6 +19,7 @@ "dependencies": { "@blueking/bk-user-display-name": "^1.0.2", "@blueking/bk-user-selector": "^0.1.1", + "@blueking/bkui-library": "^0.0.0-beta.6", "@blueking/log": "^2.0.14", "@blueking/login-modal": "^1.0.5", "aegis-web-sdk": "^1.24.18", diff --git a/src/preci/preci_server/Makefile b/src/preci/preci_server/Makefile index 0ed9c2dd..5aa6be7c 100644 --- a/src/preci/preci_server/Makefile +++ b/src/preci/preci_server/Makefile @@ -7,7 +7,7 @@ MCP_LDFLAGS := -ldflags "-X codecc/preci_server/mcp/config.Version=$(VERSION)" .PHONY: build build-server build-cli run run-server test clean help # 构建 win -build-win: build-server-win build-cli-win build-updater-win build-mcp-win copy-config-win package-win +build-win: build-server-win build-cli-win build-updater-win build-mcp-win copy-config-win copy-script-win package-win build-server-win: CGO_ENABLED=0 GOOS=windows GOARCH=amd64 go build $(SERV_LDFLAGS) -o bin/win/preci-server.exe ./cmd/server @@ -19,7 +19,7 @@ build-mcp-win: CGO_ENABLED=0 GOOS=windows GOARCH=amd64 go build $(MCP_LDFLAGS) -o bin/win/preci-mcp.exe ./cmd/mcp # 构建 linux -build-linux: build-server-linux build-cli-linux build-updater-linux build-mcp-linux copy-config-linux package-linux +build-linux: build-server-linux build-cli-linux build-updater-linux build-mcp-linux copy-config-linux copy-script-linux package-linux build-server-linux: CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build $(SERV_LDFLAGS) -o bin/linux/preci-server ./cmd/server @@ -31,7 +31,7 @@ build-mcp-linux: CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build $(MCP_LDFLAGS) -o bin/linux/preci-mcp ./cmd/mcp # 构建 mac-amd64 -build-mac-amd64: build-server-mac-amd64 build-cli-mac-amd64 build-updater-mac-amd64 build-mcp-mac-amd64 copy-config-mac-amd64 package-mac-amd64 +build-mac-amd64: build-server-mac-amd64 build-cli-mac-amd64 build-updater-mac-amd64 build-mcp-mac-amd64 copy-config-mac-amd64 copy-script-mac-amd64 package-mac-amd64 build-server-mac-amd64: CGO_ENABLED=0 GOOS=darwin GOARCH=amd64 go build $(SERV_LDFLAGS) -o bin/mac-amd64/preci-server ./cmd/server @@ -43,7 +43,7 @@ build-mcp-mac-amd64: CGO_ENABLED=0 GOOS=darwin GOARCH=amd64 go build $(MCP_LDFLAGS) -o bin/mac-amd64/preci-mcp ./cmd/mcp # 构建 mac-arm64 -build-mac-arm64: build-server-mac-arm64 build-cli-mac-arm64 build-updater-mac-arm64 build-mcp-mac-arm64 copy-config-mac-arm64 package-mac-arm64 +build-mac-arm64: build-server-mac-arm64 build-cli-mac-arm64 build-updater-mac-arm64 build-mcp-mac-arm64 copy-config-mac-arm64 copy-script-mac-arm64 package-mac-arm64 build-server-mac-arm64: CGO_ENABLED=0 GOOS=darwin GOARCH=arm64 go build $(SERV_LDFLAGS) -o bin/mac-arm64/preci-server ./cmd/server @@ -73,6 +73,21 @@ copy-config-mac-arm64: @cp -r config bin/mac-arm64/ @cp -r checkerset bin/mac-arm64/ +# 复制各平台对应的安装/卸载脚本到 bin// +copy-script: copy-script-win copy-script-linux copy-script-mac-amd64 copy-script-mac-arm64 + +copy-script-win: + @cp -r script/win/. bin/win/ + +copy-script-linux: + @cp -r script/unix/. bin/linux/ + +copy-script-mac-amd64: + @cp -r script/unix/. bin/mac-amd64/ + +copy-script-mac-arm64: + @cp -r script/unix/. bin/mac-arm64/ + # 压缩打包(按平台产出对应 zip 压缩包,输出到 bin/dist/) package: package-win package-linux package-mac-amd64 package-mac-arm64