버전 불일치 문제

scripts/jenkins-desktop-pipeline.sh

@@ -2,8 +2,8 @@
 # Jenkins goldenChart-Desktop-Pipeline — 전체 빌드·배포 진입점
 set -euo pipefail
 
-ROOT="$(cd "$(dirname "$0")/.." && pwd)"
 WORK_TREE="${WORK_TREE:-/Users/aidev/apps/goldenChart}"
+ROOT="$WORK_TREE"
 export PATH="/opt/homebrew/opt/llvm/bin:/opt/homebrew/bin:/opt/homebrew/sbin:/usr/local/bin:${PATH:-/usr/bin:/bin}"
 for prefix in "$HOME/homebrew" /opt/homebrew; do
   [[ -x "$prefix/bin/brew" ]] && eval "$("$prefix/bin/brew" shellenv)"
@@ -18,25 +18,25 @@ log "WORK_TREE=$WORK_TREE"
 
 cd "$WORK_TREE"
 
-# Git 동기화 (Jenkins SCM checkout 후에도 file:// bare 와 맞춤)
+# Git 동기화 (checkout 후 tauri.conf 가 git 버전으로 리셋됨 → bump 필수)
 if [[ -d "${GIT_DIR:-/Volumes/ADATA/git/goldenChart.git}" ]]; then
   git --git-dir="${GIT_DIR:-/Volumes/ADATA/git/goldenChart.git}" \
       --work-tree="$WORK_TREE" checkout -f main 2>/dev/null || true
 fi
 
-chmod +x "$ROOT/scripts/"*.sh 2>/dev/null || true
+chmod +x "$WORK_TREE/scripts/"*.sh 2>/dev/null || true
 
 # 의존성 (최초 1회 — 이미 있으면 빠르게 통과)
 if ! command -v cargo-xwin >/dev/null 2>&1 || ! command -v rustc >/dev/null 2>&1; then
   log "Desktop build deps 설치..."
-  "$ROOT/scripts/install-desktop-build-deps.sh"
+  "$WORK_TREE/scripts/install-desktop-build-deps.sh"
 fi
 
 # updater pubkey (repo에 desktop/updater.pub 있으면 patch만)
-if [[ -f "$ROOT/desktop/updater.pub" ]]; then
-  "$ROOT/scripts/patch-tauri-updater-pubkey.sh"
+if [[ -f "$WORK_TREE/desktop/updater.pub" ]]; then
+  "$WORK_TREE/scripts/patch-tauri-updater-pubkey.sh"
 elif [[ -f "${TAURI_SIGNER_KEY:-$HOME/.tauri/goldenchart.key}" ]]; then
-  "$ROOT/scripts/setup-desktop-updater-keys.sh"
+  "$WORK_TREE/scripts/setup-desktop-updater-keys.sh"
 fi
 
 BUILD_ARGS=(--all)
@@ -45,25 +45,36 @@ if [[ -n "${DESKTOP_BUILD_WIN_ONLY:-}" ]]; then BUILD_ARGS=(--win); fi
 if [[ -n "${BUMP_VERSION:-}" ]]; then
   BUILD_ARGS+=(--bump-version "$BUMP_VERSION")
 fi
-# 버전 bump 는 scripts/build-desktop.sh (CI BUILD_NUMBER) 에서 처리
 
-"$ROOT/scripts/build-desktop.sh" "${BUILD_ARGS[@]}"
+export WORK_TREE
+export BUILD_NUMBER="${BUILD_NUMBER:-}"
+export DESKTOP_BUMP_ON_CI="${DESKTOP_BUMP_ON_CI:-1}"
+
+# mobile pipeline 과 동일: git checkout 직후 semver bump (0.1.4 고정 tauri.conf 방지)
+if [[ -z "${BUMP_VERSION:-}" ]] && [[ -n "${BUILD_NUMBER:-}" ]] && [[ "${DESKTOP_BUMP_ON_CI:-1}" == "1" ]]; then
+  log "CI Desktop version bump..."
+  BUMPED="$("$WORK_TREE/scripts/bump-desktop-version-from-release.sh")"
+  export DESKTOP_SKIP_VERSION_BUMP=1
+  log "Desktop version → $BUMPED"
+fi
+
+"$WORK_TREE/scripts/build-desktop.sh" "${BUILD_ARGS[@]}"
 
 WORK_TREE="$WORK_TREE" \
-ARTIFACT_DIR="$ROOT/dist-desktop" \
+ARTIFACT_DIR="$WORK_TREE/dist-desktop" \
 DESKTOP_UPDATE_BASE_URL="${DESKTOP_UPDATE_BASE_URL:-https://exdev.co.kr/desktop/updates}" \
 TAURI_SIGNER_KEY="${TAURI_SIGNER_KEY:-$HOME/.tauri/goldenchart.key}" \
 DESKTOP_RELEASE_NOTES="${DESKTOP_RELEASE_NOTES:-Build ${BUILD_NUMBER:-local}}" \
-"$ROOT/scripts/publish-desktop-update.sh"
+"$WORK_TREE/scripts/publish-desktop-update.sh"
 
 # latest.json·설치 파일 nginx 즉시 반영 (볼륨 마운트)
-if [[ -x "$ROOT/scripts/reload-frontend-desktop-static.sh" ]]; then
-  WORK_TREE="$WORK_TREE" "$ROOT/scripts/reload-frontend-desktop-static.sh" || true
+if [[ -x "$WORK_TREE/scripts/reload-frontend-desktop-static.sh" ]]; then
+  WORK_TREE="$WORK_TREE" "$WORK_TREE/scripts/reload-frontend-desktop-static.sh" || true
 fi
 
 # Jenkins artifact archive 경로
-if [[ -d "$ROOT/dist-desktop" ]]; then
-  log "Artifacts ready: $ROOT/dist-desktop"
+if [[ -d "$WORK_TREE/dist-desktop" ]]; then
+  log "Artifacts ready: $WORK_TREE/dist-desktop"
 fi
 
 # 웹 frontend Docker 재배포 (latest.json static 포함) — 선택