From cce8dd3c8b8d7d29ffdb6d1cbd56e7e630c5d80c Mon Sep 17 00:00:00 2001 From: sky121113 Date: Fri, 13 Feb 2026 14:59:43 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E6=AD=A3=E9=83=A8=E7=BD=B2?= =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E6=B5=81=E4=B8=AD=E7=9A=84=E7=89=88=E6=9C=AC?= =?UTF-8?q?=E8=99=9F=E8=AE=8A=E6=95=B8=E5=90=8D=E7=A8=B1=E8=88=87=E8=A8=88?= =?UTF-8?q?=E7=AE=97=E6=96=B9=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitea/workflows/deploy.yaml | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/.gitea/workflows/deploy.yaml b/.gitea/workflows/deploy.yaml index 15eb1bd..48c8b58 100644 --- a/.gitea/workflows/deploy.yaml +++ b/.gitea/workflows/deploy.yaml @@ -81,10 +81,12 @@ jobs: port: 22 username: amba key: ${{ secrets.DEMO_SSH_KEY }} - envs: GITEA_SHA + envs: GITHUB_SHA script: | docker exec -u 1000:1000 -w /var/www/html star-erp-laravel sh -c " - VERSION=\"v1.0-\${GITEA_SHA:0:7}\" + # 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 composer install --no-dev --optimize-autoloader --no-interaction && npm install && @@ -159,7 +161,7 @@ jobs: port: 2224 username: root key: ${{ secrets.PROD_SSH_KEY }} - envs: GITEA_SHA + envs: GITHUB_SHA script: | cd /var/www/star-erp chown -R 1000:1000 . @@ -182,7 +184,8 @@ jobs: docker exec -u 1000:1000 -w /var/www/html star-erp-laravel sh -c " # 0. 更新版本號 - VERSION=\"v1.0-\${GITEA_SHA:0:7}\" + 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 composer install --no-dev --optimize-autoloader &&