From 64e039cc71794f6dad6160e8744d399f1a30bbd8 Mon Sep 17 00:00:00 2001
From: sky121113 <sky121113@gmail.com>
Date: Fri, 13 Feb 2026 15:02:12 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E6=94=B9=E7=94=A8=20YAML=20=E6=A8=A1?=
 =?UTF-8?q?=E6=9D=BF=E8=AE=8A=E6=95=B8=E7=9B=B4=E6=8E=A5=E6=B3=A8=E5=85=A5?=
 =?UTF-8?q?=20github.sha=20=E4=BB=A5=E4=BF=AE=E5=BE=A9=E7=89=88=E6=9C=AC?=
 =?UTF-8?q?=E8=99=9F=E7=82=BA=E7=A9=BA=E7=9A=84=E5=95=8F=E9=A1=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitea/workflows/deploy.yaml | 21 ++++++++++-----------
 1 file changed, 10 insertions(+), 11 deletions(-)

diff --git a/.gitea/workflows/deploy.yaml b/.gitea/workflows/deploy.yaml
index 48c8b58..b875f2c 100644
--- a/.gitea/workflows/deploy.yaml
+++ b/.gitea/workflows/deploy.yaml
@@ -74,6 +74,8 @@ jobs:
             fi
             echo "容器狀態：" && docker ps --filter "name=koori-erp-laravel"
 
+      - name: Step 4 - Composer & NPM Build
+        uses: appleboy/ssh-action@master
       - name: Step 4 - Composer & NPM Build
         uses: appleboy/ssh-action@master
         with:
@@ -81,13 +83,12 @@ jobs:
           port: 22
           username: amba
           key: ${{ secrets.DEMO_SSH_KEY }}
-          envs: GITHUB_SHA
           script: |
             docker exec -u 1000:1000 -w /var/www/html star-erp-laravel sh -c "
-              # 0. 更新版本號 (確保 GITHUB_SHA 有值，否則嘗試 git rev-parse)
-              SHORT_SHA=$(echo ${GITHUB_SHA:-$(git rev-parse HEAD)} | cut -c1-7)
-              VERSION=\"v1.0-$SHORT_SHA\"
-              sed -i \"s/^APP_VERSION=.*/APP_VERSION=\$VERSION/\" .env || echo \"APP_VERSION=\$VERSION\" >> .env
+              # 0. 更新版本號 (直接使用 Github/Gitea Actions 變數注入)
+              SHORT_SHA=$(echo "${{ github.sha }}" | cut -c1-7)
+              VERSION="v1.0-$SHORT_SHA"
+              sed -i "s/^APP_VERSION=.*/APP_VERSION=$VERSION/" .env || echo "APP_VERSION=$VERSION" >> .env
               composer install --no-dev --optimize-autoloader --no-interaction &&
               npm install &&
               npm run build &&
@@ -161,7 +162,6 @@ jobs:
           port: 2224
           username: root
           key: ${{ secrets.PROD_SSH_KEY }}
-          envs: GITHUB_SHA
           script: |
             cd /var/www/star-erp
             chown -R 1000:1000 .
@@ -171,7 +171,6 @@ jobs:
               WWWGROUP=1000 WWWUSER=1000 docker compose up -d --build --wait
             else
               echo "⚡ 無 Docker 檔案變更，僅重載服務..."
-              # 確保容器正在運行（若未運行則啟動）
               if ! docker ps --format '{{.Names}}' | grep -q 'star-erp-laravel'; then
                 echo "容器未運行，正在啟動..."
                 WWWGROUP=1000 WWWUSER=1000 docker compose up -d --wait
@@ -183,10 +182,10 @@ jobs:
             echo "容器狀態：" && docker ps --filter "name=star-erp-laravel"
 
             docker exec -u 1000:1000 -w /var/www/html star-erp-laravel sh -c "
-              # 0. 更新版本號
-              SHORT_SHA=$(echo ${GITHUB_SHA:-$(git rev-parse HEAD)} | cut -c1-7)
-              VERSION=\"v1.0-$SHORT_SHA\"
-              sed -i \"s/^APP_VERSION=.*/APP_VERSION=\$VERSION/\" .env || echo \"APP_VERSION=\$VERSION\" >> .env
+              # 0. 更新版本號 (直接注入)
+              SHORT_SHA=$(echo "${{ github.sha }}" | cut -c1-7)
+              VERSION="v1.0-$SHORT_SHA"
+              sed -i "s/^APP_VERSION=.*/APP_VERSION=$VERSION/" .env || echo "APP_VERSION=$VERSION" >> .env
 
               composer install --no-dev --optimize-autoloader &&
               npm install &&