From 1eaecbb58699381bd9e9889af767c83cb35432c3 Mon Sep 17 00:00:00 2001 From: Macbook Date: Mon, 15 Jun 2026 16:25:47 +0900 Subject: [PATCH] =?UTF-8?q?=EC=95=B1=20=EB=B9=8C=EB=93=9C=20=EB=B2=84?= =?UTF-8?q?=EC=A0=84=EB=AC=B8=EC=A0=9C=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- scripts/build-desktop.sh | 7 ++++++- scripts/prepare-desktop-jenkins-build.sh | 8 ++++++++ 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/scripts/build-desktop.sh b/scripts/build-desktop.sh index ca286ad..d9f690e 100755 --- a/scripts/build-desktop.sh +++ b/scripts/build-desktop.sh @@ -98,7 +98,12 @@ chmod +x "$WORK_TREE/scripts/prepare-tauri-build.sh" 2>/dev/null || true # shellcheck disable=SC1091 source "$WORK_TREE/scripts/prepare-tauri-build.sh" -npm install +echo "--- npm ci (monorepo) ---" +if [[ -f package-lock.json ]]; then + npm ci --prefer-offline +else + npm install +fi echo "--- Vite build (desktop) ---" export DESKTOP_APP_VERSION="$VERSION" diff --git a/scripts/prepare-desktop-jenkins-build.sh b/scripts/prepare-desktop-jenkins-build.sh index 5814675..a2036f4 100755 --- a/scripts/prepare-desktop-jenkins-build.sh +++ b/scripts/prepare-desktop-jenkins-build.sh @@ -37,5 +37,13 @@ if [[ -f "$WORK_TREE/desktop/updater.pub" ]]; then "$WORK_TREE/scripts/patch-tauri-updater-pubkey.sh" fi +log "npm ci (monorepo deps — git reset 후 node_modules 불일치 방지)" +cd "$WORK_TREE" +if [[ -f package-lock.json ]]; then + npm ci --prefer-offline +else + npm install +fi + log "HEAD $(git -C "$WORK_TREE" rev-parse --short HEAD 2>/dev/null || echo n/a)" log "prepare OK"