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