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 &&