버전 업 오류

scripts/jenkins-desktop-pipeline.sh

@@ -18,10 +18,16 @@ log "WORK_TREE=$WORK_TREE"
 
 cd "$WORK_TREE"
 
+# CI 에서는 BUILD_NUMBER 유무와 관계없이 semver bump (로컬 수동 실행 포함)
+export DESKTOP_AUTO_BUMP="${DESKTOP_AUTO_BUMP:-1}"
+
 # 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
+GIT_DIR="${GIT_DIR:-/Volumes/ADATA/git/goldenChart.git}"
+if [[ -d "$GIT_DIR" ]]; then
+  if git --git-dir="$GIT_DIR" remote get-url origin >/dev/null 2>&1; then
+    git --git-dir="$GIT_DIR" fetch origin main 2>/dev/null || true
+  fi
+  git --git-dir="$GIT_DIR" --work-tree="$WORK_TREE" checkout -f main 2>/dev/null || true
 fi
 
 chmod +x "$WORK_TREE/scripts/"*.sh 2>/dev/null || true
@@ -50,12 +56,15 @@ 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
+# mobile pipeline 과 동일: git checkout 직후 semver bump (0.1.18 등 git 구버전 방지)
+if [[ -z "${BUMP_VERSION:-}" ]] && [[ "${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"
+  log "Desktop version → $BUMPED (tauri.conf + package.json)"
+else
+  BUMPED="$(node -p "require('$WORK_TREE/desktop/src-tauri/tauri.conf.json').version" 2>/dev/null || echo '?')"
+  log "Desktop version bump skipped — using v$BUMPED"
 fi
 
 "$WORK_TREE/scripts/build-desktop.sh" "${BUILD_ARGS[@]}"