diff --git a/.github/workflows/release-lite.yml b/.github/workflows/release-lite.yml index eb6b0bf9..d4f9b13b 100644 --- a/.github/workflows/release-lite.yml +++ b/.github/workflows/release-lite.yml @@ -22,7 +22,7 @@ env: NODE_VERSION: "22" jobs: - # ── 1. Build frontend once, share as artifact ── + # ── 1. Build frontend once, share as artifact (for Web CLI) ── build-frontend: runs-on: ubuntu-latest steps: @@ -46,7 +46,7 @@ jobs: path: frontend/dist/ retention-days: 1 - # ── 2. Build Go binary per platform (native CGO) ── + # ── 2a. Build Web CLI binary per platform (native CGO) ── build-binary: needs: build-frontend strategy: @@ -133,9 +133,184 @@ jobs: WeKnora-lite_*.tar.gz.sha256 retention-days: 3 + # ── 2b. Build Desktop APP per platform (Wails) ── + build-desktop-app: + strategy: + fail-fast: false + matrix: + include: + - os: macos-14 + platform: darwin/universal + arch_label: macOS_universal + artifact_name: desktop-macos-universal + - os: macos-13 + platform: darwin/amd64 + arch_label: macOS_amd64 + artifact_name: desktop-macos-amd64 + - os: macos-14 + platform: darwin/arm64 + arch_label: macOS_arm64 + artifact_name: desktop-macos-arm64 + - os: ubuntu-latest + platform: linux/amd64 + arch_label: linux_amd64 + artifact_name: desktop-linux-amd64 + - os: windows-latest + platform: windows/amd64 + arch_label: windows_amd64 + artifact_name: desktop-windows-amd64 + runs-on: ${{ matrix.os }} + env: + CGO_ENABLED: 1 + steps: + - uses: actions/checkout@v4 + + - uses: actions/setup-go@v5 + with: + go-version: ${{ env.GO_VERSION }} + cache: true + + - uses: actions/setup-node@v4 + with: + node-version: ${{ env.NODE_VERSION }} + cache: npm + cache-dependency-path: frontend/package-lock.json + + - name: Install Wails CLI + run: go install github.com/wailsapp/wails/v2/cmd/wails@latest + + - name: Install Linux dependencies + if: runner.os == 'Linux' + run: | + sudo apt-get update + sudo apt-get install -y libgtk-3-dev libwebkit2gtk-4.1-dev + + - name: Install NSIS (Windows) + if: runner.os == 'Windows' + run: choco install nsis -y + + - name: Resolve version + id: ver + shell: bash + run: | + if [ -n "${{ inputs.tag }}" ]; then + VERSION="${{ inputs.tag }}" + else + VERSION="${GITHUB_REF#refs/tags/}" + fi + echo "version=${VERSION}" >> "$GITHUB_OUTPUT" + + - name: Build desktop app + shell: bash + run: | + export EDITION=lite + eval "$(./scripts/get_version.sh env)" + LDFLAGS="$(./scripts/get_version.sh ldflags) -X 'google.golang.org/protobuf/reflect/protoregistry.conflictPolicy=warn'" + export CGO_CFLAGS="-Wno-deprecated-declarations" + + BUILD_TAGS="sqlite_fts5" + NSIS_FLAG="" + + if [ "${{ runner.os }}" = "Linux" ]; then + BUILD_TAGS="sqlite_fts5 webkit2_41" + fi + if [ "${{ runner.os }}" = "macOS" ]; then + export CGO_LDFLAGS="-Wl,-no_warn_duplicate_libraries" + fi + if [ "${{ runner.os }}" = "Windows" ]; then + NSIS_FLAG="-nsis" + fi + + cd cmd/desktop + wails build -skipbindings -clean \ + -tags "${BUILD_TAGS}" \ + -platform "${{ matrix.platform }}" \ + ${NSIS_FLAG} \ + -ldflags="${LDFLAGS}" \ + -o "WeKnora Lite" + + # ── macOS: bundle .app with resources, then create DMG ── + - name: Package macOS app + if: runner.os == 'macOS' + run: | + APP_BUNDLE="WeKnora Lite.app" + SRC="cmd/desktop/build/bin/${APP_BUNDLE}" + RESOURCES="${SRC}/Contents/Resources" + + mkdir -p "${RESOURCES}/config" + mkdir -p "${RESOURCES}/migrations/sqlite" + + if [ -f .env.lite.example ]; then + cp .env.lite.example "${RESOURCES}/.env" + fi + if [ -d migrations/sqlite ]; then + cp -r migrations/sqlite/* "${RESOURCES}/migrations/sqlite/" + fi + if [ -d config ]; then + cp -r config/* "${RESOURCES}/config/" + fi + + DMG_NAME="WeKnora-Lite-App_${{ steps.ver.outputs.version }}_${{ matrix.arch_label }}" + + DMG_SRC="dmg_staging" + mkdir -p "${DMG_SRC}" + cp -R "cmd/desktop/build/bin/${APP_BUNDLE}" "${DMG_SRC}/" + ln -s /Applications "${DMG_SRC}/Applications" + + hdiutil create -volname "WeKnora Lite" \ + -srcfolder "${DMG_SRC}" \ + -ov -format UDZO \ + "${DMG_NAME}.dmg" + + shasum -a 256 "${DMG_NAME}.dmg" > "${DMG_NAME}.dmg.sha256" + + # ── Linux: package tarball ── + - name: Package Linux app + if: runner.os == 'Linux' + run: | + ARCHIVE="WeKnora-Lite-App_${{ steps.ver.outputs.version }}_${{ matrix.arch_label }}" + mkdir -p "${ARCHIVE}" + cp "cmd/desktop/build/bin/WeKnora Lite" "${ARCHIVE}/" + if [ -f .env.lite.example ]; then + cp .env.lite.example "${ARCHIVE}/" + fi + cp docs/LITE.md "${ARCHIVE}/README.md" + if [ -d config ]; then + cp -r config "${ARCHIVE}/config" + fi + if [ -d migrations/sqlite ]; then + mkdir -p "${ARCHIVE}/migrations/sqlite" + cp -r migrations/sqlite/* "${ARCHIVE}/migrations/sqlite/" + fi + tar czf "${ARCHIVE}.tar.gz" "${ARCHIVE}" + shasum -a 256 "${ARCHIVE}.tar.gz" > "${ARCHIVE}.tar.gz.sha256" + + # ── Windows: package NSIS installer or plain exe ── + - name: Package Windows app + if: runner.os == 'Windows' + shell: bash + run: | + ARCHIVE="WeKnora-Lite-App_${{ steps.ver.outputs.version }}_${{ matrix.arch_label }}" + # Wails -nsis generates an installer named {app}-amd64-installer.exe + INSTALLER="cmd/desktop/build/bin/WeKnora Lite-amd64-installer.exe" + if [ -f "$INSTALLER" ]; then + cp "$INSTALLER" "${ARCHIVE}_setup.exe" + sha256sum "${ARCHIVE}_setup.exe" > "${ARCHIVE}_setup.exe.sha256" + else + cp "cmd/desktop/build/bin/WeKnora Lite.exe" "${ARCHIVE}.exe" + sha256sum "${ARCHIVE}.exe" > "${ARCHIVE}.exe.sha256" + fi + + - uses: actions/upload-artifact@v4 + with: + name: ${{ matrix.artifact_name }} + path: | + WeKnora-Lite-App_* + retention-days: 3 + # ── 3. Create GitHub Release ── release: - needs: build-binary + needs: [build-binary, build-desktop-app] runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 @@ -145,6 +320,11 @@ jobs: pattern: release-* merge-multiple: true + - uses: actions/download-artifact@v4 + with: + pattern: desktop-* + merge-multiple: true + - name: Resolve version id: ver run: | @@ -161,9 +341,9 @@ jobs: cat > notes.md << 'NOTES' ## WeKnora Lite ${{ steps.ver.outputs.version }} - 单二进制部署,零外部依赖(无需 Docker / PostgreSQL / Redis)。 + ### Web CLI 版(命令行 / 服务器部署) - ### 快速开始 + 单二进制部署,零外部依赖(无需 Docker / PostgreSQL / Redis)。 ```bash # 1. 解压 @@ -185,8 +365,6 @@ jobs: # 访问 http://localhost:8080 ``` - ### 平台支持 - | 文件 | 平台 | |------|------| | `WeKnora-lite_*_linux_amd64.tar.gz` | Linux x86_64 | @@ -194,6 +372,20 @@ jobs: | `WeKnora-lite_*_darwin_amd64.tar.gz` | macOS Intel | | `WeKnora-lite_*_darwin_arm64.tar.gz` | macOS Apple Silicon | + --- + + ### 桌面 APP 版(开箱即用,无需命令行) + + 原生桌面应用,内置 Web 服务,双击即可运行。 + + | 文件 | 平台 | + |------|------| + | `WeKnora-Lite-App_*_macOS_universal.dmg` | macOS (Intel + Apple Silicon) | + | `WeKnora-Lite-App_*_macOS_amd64.dmg` | macOS Intel | + | `WeKnora-Lite-App_*_macOS_arm64.dmg` | macOS Apple Silicon | + | `WeKnora-Lite-App_*_linux_amd64.tar.gz` | Linux x86_64 | + | `WeKnora-Lite-App_*_windows_amd64_setup.exe` | Windows x86_64 (安装包) | + 详细文档见 [LITE.md](docs/LITE.md)。 NOTES @@ -205,7 +397,8 @@ jobs: --title "WeKnora Lite ${{ steps.ver.outputs.version }}" \ --notes-file notes.md \ WeKnora-lite_*.tar.gz \ - WeKnora-lite_*.tar.gz.sha256 + WeKnora-lite_*.tar.gz.sha256 \ + WeKnora-Lite-App_* || true # ── 4. Update Homebrew Formula ── update-homebrew: diff --git a/cmd/desktop/main.go b/cmd/desktop/main.go index 95012e7a..0a29d6d5 100644 --- a/cmd/desktop/main.go +++ b/cmd/desktop/main.go @@ -30,7 +30,6 @@ import ( "github.com/Tencent/WeKnora/internal/types/interfaces" "github.com/joho/godotenv" wailsruntime "github.com/wailsapp/wails/v2/pkg/runtime" - "golang.org/x/sys/unix" ) // dragHandlerJS is injected into the webview on DomReady. @@ -360,16 +359,9 @@ func migrateLegacyDesktopData(resourcesDir, targetDataDir string) { } func listenWithRetry(addr string, maxRetries int, baseDelay time.Duration) (net.Listener, error) { - lc := net.ListenConfig{ - Control: func(network, address string, c syscall.RawConn) error { - return c.Control(func(fd uintptr) { - _ = syscall.SetsockoptInt(int(fd), syscall.SOL_SOCKET, unix.SO_REUSEPORT, 1) - }) - }, - } var lastErr error for i := 0; i < maxRetries; i++ { - listener, err := lc.Listen(context.Background(), "tcp", addr) + listener, err := net.Listen("tcp", addr) if err == nil { return listener, nil } diff --git a/cmd/server/main.go b/cmd/server/main.go index 6f471297..459c830f 100644 --- a/cmd/server/main.go +++ b/cmd/server/main.go @@ -25,11 +25,9 @@ package main import ( "context" "fmt" - "net" "net/http" "os" "os/signal" - "syscall" "time" "github.com/gin-gonic/gin" @@ -40,8 +38,6 @@ import ( "github.com/Tencent/WeKnora/internal/runtime" "github.com/Tencent/WeKnora/internal/tracing" "github.com/Tencent/WeKnora/internal/types/interfaces" - - "golang.org/x/sys/unix" ) func main() { @@ -76,7 +72,7 @@ func main() { ctx, done := context.WithCancel(context.Background()) signals := make(chan os.Signal, 1) - signal.Notify(signals, syscall.SIGINT, syscall.SIGTERM, syscall.SIGHUP) + signal.Notify(signals, shutdownSignals...) go func() { sig := <-signals logger.Infof(context.Background(), "Received signal: %v, starting server shutdown...", sig) @@ -125,33 +121,3 @@ func main() { logger.Fatalf(context.Background(), "Failed to run application: %v", err) } } - -// listenWithRetry retries listening with exponential backoff and SO_REUSEPORT, -// useful during hot-reload when the previous process may not have released the port yet. -func listenWithRetry(addr string, maxRetries int, baseDelay time.Duration) (net.Listener, error) { - lc := net.ListenConfig{ - Control: func(network, address string, c syscall.RawConn) error { - return c.Control(func(fd uintptr) { - _ = syscall.SetsockoptInt(int(fd), syscall.SOL_SOCKET, unix.SO_REUSEPORT, 1) - }) - }, - } - - var lastErr error - for i := 0; i < maxRetries; i++ { - listener, err := lc.Listen(context.Background(), "tcp", addr) - if err == nil { - return listener, nil - } - lastErr = err - if i < maxRetries-1 { - delay := baseDelay * time.Duration(1< 3*time.Second { - delay = 3 * time.Second - } - logger.Warnf(context.Background(), "Port %s in use, retrying in %v... (%d/%d)", addr, delay, i+1, maxRetries) - time.Sleep(delay) - } - } - return nil, lastErr -}