Restore panel build in CI, add browser fallback for Open Admin Panel
Some checks failed
Release / build (push) Failing after 21s

- Re-add CGO panel builds with apt-get install of gcc/g++/mingw-w64/webkit2gtk
- Panel launch falls back to default browser if panel binary not found
- Restore panel binary in nfpm .deb package

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
This commit is contained in:
Axel Meyer
2026-03-03 21:55:29 +01:00
parent 3f6b3c20e0
commit 6149a82d0b
3 changed files with 50 additions and 28 deletions

View File

@@ -21,6 +21,11 @@ jobs:
tar -C /usr/local -xzf /tmp/go.tar.gz
echo "/usr/local/go/bin" >> $GITHUB_PATH
- name: Install build tools
run: |
apt-get update -qq
apt-get install -y -qq gcc g++ mingw-w64 zip libwebkit2gtk-4.0-dev >/dev/null 2>&1
- name: Install nfpm
run: |
export GOPATH=$HOME/go
@@ -30,11 +35,13 @@ jobs:
- name: Build Linux binaries
run: |
CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -trimpath -ldflags="-s -w" -o syncwarden ./cmd/syncwarden
CGO_ENABLED=1 GOOS=linux GOARCH=amd64 go build -trimpath -ldflags="-s -w" -o syncwarden-panel ./cmd/panel
CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -trimpath -ldflags="-s -w" -o syncwarden-setup ./cmd/setup
- name: Build Windows binaries
run: |
CGO_ENABLED=0 GOOS=windows GOARCH=amd64 go build -trimpath -ldflags="-s -w -H=windowsgui" -o syncwarden.exe ./cmd/syncwarden
CGO_ENABLED=1 GOOS=windows GOARCH=amd64 CC=x86_64-w64-mingw32-gcc CXX=x86_64-w64-mingw32-g++ go build -trimpath -ldflags="-s -w -H=windowsgui" -o syncwarden-panel.exe ./cmd/panel
CGO_ENABLED=0 GOOS=windows GOARCH=amd64 go build -trimpath -ldflags="-s -w" -o syncwarden-setup.exe ./cmd/setup
- name: Build .deb package
@@ -43,16 +50,15 @@ jobs:
- name: Create Linux tarball
run: |
mkdir -p dist/syncwarden-${{ env.VERSION }}
cp syncwarden syncwarden-setup dist/syncwarden-${{ env.VERSION }}/
cp syncwarden syncwarden-panel syncwarden-setup dist/syncwarden-${{ env.VERSION }}/
cp README.md CHANGELOG.md LICENSE dist/syncwarden-${{ env.VERSION }}/
cp packaging/linux/syncwarden.desktop dist/syncwarden-${{ env.VERSION }}/
tar -czf syncwarden_${{ env.VERSION }}_linux_amd64.tar.gz -C dist syncwarden-${{ env.VERSION }}
- name: Create Windows zip
run: |
apt-get update -qq && apt-get install -y -qq zip >/dev/null 2>&1
mkdir -p dist-win/syncwarden-${{ env.VERSION }}
cp syncwarden.exe syncwarden-setup.exe dist-win/syncwarden-${{ env.VERSION }}/
cp syncwarden.exe syncwarden-panel.exe syncwarden-setup.exe dist-win/syncwarden-${{ env.VERSION }}/
cp README.md CHANGELOG.md LICENSE dist-win/syncwarden-${{ env.VERSION }}/
cd dist-win && zip -r ../syncwarden_${{ env.VERSION }}_windows_amd64.zip syncwarden-${{ env.VERSION }}

View File

@@ -14,14 +14,14 @@ var (
panelProc *os.Process
)
// launchPanel starts the syncwarden-panel subprocess if not already running.
// launchPanel opens the Syncthing admin UI.
// Tries the embedded panel binary first, falls back to the default browser.
func launchPanel(baseURL string) {
panelMu.Lock()
defer panelMu.Unlock()
// Check if already running
// Check if panel subprocess is already running
if panelProc != nil {
// Check if process is still alive
if err := panelProc.Signal(os.Signal(nil)); err == nil {
log.Println("panel already running")
return
@@ -29,23 +29,15 @@ func launchPanel(baseURL string) {
panelProc = nil
}
// Try embedded panel binary
panelBin := panelBinaryPath()
if panelBin == "" {
log.Println("syncwarden-panel binary not found")
return
}
if panelBin != "" {
cmd := exec.Command(panelBin, "-addr", baseURL)
cmd.Stdout = os.Stdout
cmd.Stderr = os.Stderr
if err := cmd.Start(); err != nil {
log.Printf("failed to start panel: %v", err)
return
}
if err := cmd.Start(); err == nil {
panelProc = cmd.Process
log.Printf("panel started (pid %d)", cmd.Process.Pid)
// Wait for process to exit in background
go func() {
_ = cmd.Wait()
panelMu.Lock()
@@ -53,9 +45,16 @@ func launchPanel(baseURL string) {
panelMu.Unlock()
log.Println("panel exited")
}()
return
}
log.Printf("failed to start panel binary: %v", panelBin)
}
// Fallback: open in default browser
log.Printf("opening %s in browser", baseURL)
openBrowser(baseURL)
}
// panelBinaryPath finds the syncwarden-panel binary next to the main binary.
func panelBinaryPath() string {
exe, err := os.Executable()
if err != nil {
@@ -74,3 +73,18 @@ func panelBinaryPath() string {
}
return ""
}
func openBrowser(url string) {
var cmd *exec.Cmd
switch runtime.GOOS {
case "windows":
cmd = exec.Command("rundll32", "url.dll,FileProtocolHandler", url)
case "darwin":
cmd = exec.Command("open", url)
default:
cmd = exec.Command("xdg-open", url)
}
if err := cmd.Start(); err != nil {
log.Printf("failed to open browser: %v", err)
}
}

View File

@@ -11,6 +11,8 @@ license: MIT
contents:
- src: ./syncwarden
dst: /usr/bin/syncwarden
- src: ./syncwarden-panel
dst: /usr/bin/syncwarden-panel
- src: ./packaging/linux/syncwarden.desktop
dst: /etc/xdg/autostart/syncwarden.desktop
type: config