From 1b58cd1a350c7faee2a813c86cb0255490402309 Mon Sep 17 00:00:00 2001 From: richblack Date: Mon, 27 Jul 2026 21:17:50 +0800 Subject: [PATCH] =?UTF-8?q?fix(t72):=20build-windows.sh=20=E8=A3=9C?= =?UTF-8?q?=E7=89=88=E6=9C=AC=E6=B3=A8=E5=85=A5=EF=BC=88Mac=20=E6=9C=89?= =?UTF-8?q?=E3=80=81Windows=20=E6=BC=8F=E4=BA=86=EF=BC=89=EF=BC=8Btray=20g?= =?UTF-8?q?o.mod=20tidy?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 實測抓到：Windows 版編出來 v0.10.0 命中 0——版本注入只加在 build-mac.sh， Windows 那支漏了（我今天改的那份在 detached worktree，沒進分支）。 v0.10.0 兩平台實測： Mac zip 15.92MB｜托盤 21.15MB(strip)｜collector 14.46MB(含 PDFium) Win zip 16.86MB｜tray 22.40MB｜collector 15.15MB 兩者皆 < jsDelivr 20MB 指紋全中：v0.10.0／版本列／結束 Arcrun RAG／PDF 打不開(轉檔層) 順帶修：tray go.mod 需 tidy 才編得過（合併後又被覆蓋，撞了兩次）。 --- cmd/arcrun-tray/build-windows.sh | 9 ++++++++- cmd/arcrun-tray/go.mod | 8 ++++---- cmd/arcrun-tray/go.sum | 12 ++++++------ 3 files changed, 18 insertions(+), 11 deletions(-) diff --git a/cmd/arcrun-tray/build-windows.sh b/cmd/arcrun-tray/build-windows.sh index 8142cec..462570a 100644 --- a/cmd/arcrun-tray/build-windows.sh +++ b/cmd/arcrun-tray/build-windows.sh @@ -18,6 +18,13 @@ set -euo pipefail cd "$(dirname "$0")" +# 版本編號（leo 2026-07-27：「daemon 要加上版本編號」）——與 build-mac.sh 同一套。 +# 沒版本號時只能靠 shasum 對帳，使用者根本做不到（見 daemon-beta tasks t63）。 +VERSION="${VERSION:-$(git describe --tags --always --dirty 2>/dev/null || echo dev)}" +BUILD_TIME="$(date '+%Y%m%d-%H%M')" +LDFLAGS_VER="-X main.version=${VERSION} -X main.buildTime=${BUILD_TIME}" +echo "🏷 版本：${VERSION}（build ${BUILD_TIME}）" + OUT="dist-windows" CC_WIN="${CC_WIN:-x86_64-w64-mingw32-gcc}" @@ -36,7 +43,7 @@ echo "② 編 collector.exe（純 stdlib，CGO_ENABLED=0 即可）" echo "③ 編托盤 GUI（fyne＝CGo+GL，走 mingw；-H windowsgui＝不彈黑色命令列視窗）" CGO_ENABLED=1 GOOS=windows GOARCH=amd64 CC="$CC_WIN" \ - go build -ldflags "-H windowsgui -s -w" -o "$OUT/arcrun-tray.exe" . + go build -ldflags "-H windowsgui -s -w ${LDFLAGS_VER}" -o "$OUT/arcrun-tray.exe" . echo "④ 打包 zip" ( cd "$OUT" && zip -9 -q ArcrunRAG-win-unsigned.zip arcrun-tray.exe arcrun-collector.exe ) diff --git a/cmd/arcrun-tray/go.mod b/cmd/arcrun-tray/go.mod index e51677d..d87eabb 100644 --- a/cmd/arcrun-tray/go.mod +++ b/cmd/arcrun-tray/go.mod @@ -3,7 +3,7 @@ // 本 module 在 Mac/Windows 真機 build（leo/地端）：`go mod tidy && fyne package`。 module arcrun-rag/collector/cmd/arcrun-tray -go 1.22 +go 1.25.0 require ( arcrun-rag/collector v0.0.0 @@ -36,9 +36,9 @@ require ( github.com/yuin/goldmark v1.7.1 // indirect golang.org/x/image v0.18.0 // indirect golang.org/x/mobile v0.0.0-20231127183840-76ac6878050a // indirect - golang.org/x/net v0.25.0 // indirect - golang.org/x/sys v0.20.0 // indirect - golang.org/x/text v0.16.0 // indirect + golang.org/x/net v0.57.0 // indirect + golang.org/x/sys v0.47.0 // indirect + golang.org/x/text v0.40.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/cmd/arcrun-tray/go.sum b/cmd/arcrun-tray/go.sum index 0956cc2..1f19152 100644 --- a/cmd/arcrun-tray/go.sum +++ b/cmd/arcrun-tray/go.sum @@ -384,8 +384,8 @@ golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v golang.org/x/net v0.0.0-20210316092652-d523dce5a7f4/go.mod h1:RBQZq4jEuRlivfhVLdyRGr576XBO4/greRjx4P4O3yc= golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM= golang.org/x/net v0.0.0-20210805182204-aaa1db679c0d/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= -golang.org/x/net v0.25.0 h1:d/OCCoBEUq33pjydKrGQhw7IlUPI2Oylr+8qLx49kac= -golang.org/x/net v0.25.0/go.mod h1:JkAGAh7GEvH74S6FOH42FLoXpXbE/aqXSrIQjXgsiwM= +golang.org/x/net v0.57.0 h1:K5+3DljvIuDG9/Jv9rvyMywYNFCQ9RSUY6OOTTkT+tE= +golang.org/x/net v0.57.0/go.mod h1:KpXc8iv+r3XplLAG/f7Jsf9RPszJzdR0f58q9vGOuEU= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= @@ -454,8 +454,8 @@ golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210809222454-d867a43fc93e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.20.0 h1:Od9JTbYCk261bKm4M/mw7AklTlFYIa0bIp9BgSm1S8Y= -golang.org/x/sys v0.20.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.47.0 h1:o7XGOvZQCADBQQ4Y7VNq2dRWQR7JmOUW8Kxx4ZsNgWs= +golang.org/x/sys v0.47.0/go.mod h1:4GL1E5IUh+htKOUEOaiffhrAeqysfVGipDYzABqnCmw= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= @@ -465,8 +465,8 @@ golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.4/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/text v0.16.0 h1:a94ExnEXNtEwYLGJSIUxnWoxoRz/ZcCsV63ROupILh4= -golang.org/x/text v0.16.0/go.mod h1:GhwF1Be+LQoKShO3cGOHzqOgRrGaYc9AvblQOmPVHnI= +golang.org/x/text v0.40.0 h1:Ub2Z6/xjgF1WrYQz2nuITOEegKFtiIy+rieRJ5lHZKs= +golang.org/x/text v0.40.0/go.mod h1:hpnzDAfGV753zIKo+wk3u1bVKCGPbrnF7+7LBF/UHVY= golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=