diff --git a/.gitea/workflows/deploy.yaml b/.gitea/workflows/deploy.yaml index 82e6644..2e638f5 100644 --- a/.gitea/workflows/deploy.yaml +++ b/.gitea/workflows/deploy.yaml @@ -83,20 +83,21 @@ jobs: echo "容器狀態:" && docker ps --filter "name=koori-erp-laravel" - - name: Step 4 - Composer & NPM Build - uses: appleboy/ssh-action@master - with: - host: 192.168.0.103 - port: 22 - username: amba - key: ${{ secrets.DEMO_SSH_KEY }} - script: | - docker exec -u 1000:1000 -w /var/www/html star-erp-laravel sh -c " - # 0. 更新版本號 (使用 Git Hash) - VERSION=\"v1.0-\$(git rev-parse --short HEAD)\" - sed -i \"s/^APP_VERSION=.*/APP_VERSION=\$VERSION/\" .env || echo \"APP_VERSION=\$VERSION\" >> .env - - # 1. 後端依賴 (Demo 環境建議加上 --no-interaction 避免卡住) + - name: Step 4 - Composer & NPM Build + uses: appleboy/ssh-action@master + with: + host: 192.168.0.103 + port: 22 + username: amba + key: ${{ secrets.DEMO_SSH_KEY }} + envs: GITEA_SHA + script: | + docker exec -u 1000:1000 -w /var/www/html star-erp-laravel sh -c " + # 0. 更新版本號 (使用 Gitea 提供的 SHA) + VERSION=\"v1.0-\${GITEA_SHA:0:7}\" + sed -i \"s/^APP_VERSION=.*/APP_VERSION=\$VERSION/\" .env || echo \"APP_VERSION=\$VERSION\" >> .env + + # 1. 後端依賴 composer install --no-dev --optimize-autoloader --no-interaction && # 2. 前端編譯 @@ -174,6 +175,7 @@ jobs: port: 2224 username: root key: ${{ secrets.PROD_SSH_KEY }} + envs: GITEA_SHA script: | cd /var/www/star-erp chown -R 1000:1000 . @@ -196,7 +198,7 @@ jobs: docker exec -u 1000:1000 -w /var/www/html star-erp-laravel sh -c " # 0. 更新版本號 - VERSION=\"v1.0-\$(git rev-parse --short HEAD)\" + VERSION=\"v1.0-\${GITEA_SHA:0:7}\" sed -i \"s/^APP_VERSION=.*/APP_VERSION=\$VERSION/\" .env || echo \"APP_VERSION=\$VERSION\" >> .env composer install --no-dev --optimize-autoloader &&