From 070784d43ced166803a30ef8f0f6319aedf146f9 Mon Sep 17 00:00:00 2001 From: Autumn-27 <53844290+Autumn-27@users.noreply.github.com> Date: Sun, 23 Aug 2026 03:55:10 -0400 Subject: [PATCH] =?UTF-8?q?revert:=20=E6=81=A2=E5=A4=8D=E7=89=88=E6=9C=AC?= =?UTF-8?q?=E5=8F=B7=E5=8A=A8=E6=80=81=E6=B3=A8=E5=85=A5=EF=BC=8C=E6=9C=AC?= =?UTF-8?q?=E5=9C=B0=E6=9E=84=E5=BB=BA=E5=9B=9E=E9=80=80=E4=B8=BA=20dev?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 本地运行不再硬编码 0.3.3,改回 dev;build.sh 通过 git describe 注入真实 tag 并经 ldflags 覆盖 main.version。 Claude-Session: https://claude.ai/code/session_01HMRoSjvobCcuH5gbKkStFF --- build.sh | 10 ++++++++-- cmd/artex/main.go | 6 +++--- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/build.sh b/build.sh index 52ba0b6..e8efac8 100755 --- a/build.sh +++ b/build.sh @@ -8,7 +8,7 @@ # ARTEX_TARGET_OS=linux One target OS in single-target mode. # ARTEX_TARGET_ARCH=amd64 One target arch in single-target mode. # ARTEX_TARGETS=linux/amd64,... Comma-separated targets for multi-target mode. -# ARTEX_BUILD_VERSION=0.3.3 Version embedded in the binary and archive name. +# ARTEX_BUILD_VERSION=v0.3.3 Version embedded in the binary and archive name. # ARTEX_OUTPUT=/path/to/artex Explicit binary path in single-target mode. # ARTEX_OUTPUT_DIR=dist Directory for default binary paths. # ARTEX_PACKAGE=1 Create a zip archive for each target. @@ -90,7 +90,13 @@ done command -v go >/dev/null 2>&1 || die "未检测到 Go(项目需要 Go 1.26 或更高版本)" ARTEX_GOSUMDB="${ARTEX_GOSUMDB:-sum.golang.org}" -ARTEX_BUILD_VERSION="${ARTEX_BUILD_VERSION:-0.3.3}" +if [ -z "${ARTEX_BUILD_VERSION:-}" ]; then + if command -v git >/dev/null 2>&1 && git rev-parse --is-inside-work-tree >/dev/null 2>&1; then + ARTEX_BUILD_VERSION="$(git describe --tags --always --dirty)" + else + ARTEX_BUILD_VERSION="dev" + fi +fi # Release tags are commonly passed as v0.3.3; keep the binary version consistent. ARTEX_BUILD_VERSION="${ARTEX_BUILD_VERSION#v}" ARTEX_OUTPUT_DIR="${ARTEX_OUTPUT_DIR:-dist}" diff --git a/cmd/artex/main.go b/cmd/artex/main.go index 6023245..cbc5b42 100644 --- a/cmd/artex/main.go +++ b/cmd/artex/main.go @@ -21,9 +21,9 @@ import ( "github.com/Autumn-27/artex/server" ) -// version is the application version. Release builds may override it via -// -ldflags "-X main.version=". -var version = "0.3.3" +// version is the build version, injected at release time via +// -ldflags "-X main.version=". Defaults to "dev" for local builds. +var version = "dev" const banner = ` _ ____ _____ _______ __