diff --git a/.gitea/workflows/ci-pipeline.yml b/.gitea/workflows/ci-pipeline.yml index b0b3d7eb3..a801eaf24 100755 --- a/.gitea/workflows/ci-pipeline.yml +++ b/.gitea/workflows/ci-pipeline.yml @@ -26,7 +26,7 @@ concurrency: cancel-in-progress: ${{ gitea.event_name == 'pull_request' }} env: CI_PG_HOST: host.docker.internal - CI_PG_PORT: "5432" + CI_LOCAL_PG_PORT: "5432" CI_PG_USER: postgres CI_PG_PASSWORD: postgres CI_PG_DB: xiaoxia_saas @@ -262,7 +262,7 @@ jobs: permissions: contents: read env: - DATABASE_URL: postgresql+psycopg://${{ env.CI_PG_USER }}:${{ env.CI_PG_PASSWORD }}@${{ env.CI_PG_HOST }}:${{ env.CI_PG_PORT }}/${{ env.CI_PG_DB }} + DATABASE_URL: postgresql+psycopg://${{ env.CI_PG_USER }}:${{ env.CI_PG_PASSWORD }}@${{ env.CI_PG_HOST }}:${{ env.CI_LOCAL_PG_PORT }}/${{ env.CI_PG_DB }} USE_IN_MEMORY_DB: 'false' CI_USE_SHARED_PG: 'true' steps: @@ -411,7 +411,7 @@ jobs: - validate-type-check - validate-migration env: - DATABASE_URL: postgresql+psycopg://${{ env.CI_PG_USER }}:${{ env.CI_PG_PASSWORD }}@${{ env.CI_PG_HOST }}:${{ env.CI_PG_PORT }}/${{ env.CI_PG_DB }} + DATABASE_URL: postgresql+psycopg://${{ env.CI_PG_USER }}:${{ env.CI_PG_PASSWORD }}@${{ env.CI_PG_HOST }}:${{ env.CI_LOCAL_PG_PORT }}/${{ env.CI_PG_DB }} USE_IN_MEMORY_DB: 'false' CI_USE_SHARED_PG: 'true' OSS_ACCESS_KEY_ID: placeholder diff --git a/scripts/ci/chatops/config.py b/scripts/ci/chatops/config.py index 008bb7f6d..97b7a72ee 100755 --- a/scripts/ci/chatops/config.py +++ b/scripts/ci/chatops/config.py @@ -34,7 +34,7 @@ FEISHU_APP_SECRET = os.environ.get("FEISHU_APP_SECRET", "") NOTIFY_BRANCHES = [b.strip() for b in os.environ.get("CHATOPS_NOTIFY_BRANCHES", "main,develop").split(",") if b.strip()] # ── Webhook 服务配置 ────────────────────────────────── -WEBHOOK_PORT = int(os.environ.get("CHATOPS_WEBHOOK_PORT", "8090")) +CHATOPS_WEBHOOK_PORT = int(os.environ.get("CHATOPS_WEBHOOK_PORT", "8090")) WEBHOOK_SECRET = os.environ.get("CHATOPS_WEBHOOK_SECRET", "") # ── 常量 ────────────────────────────────────────────── diff --git a/scripts/ci/chatops/webhook_server.py b/scripts/ci/chatops/webhook_server.py index 0cbcc5d14..8efcc570c 100755 --- a/scripts/ci/chatops/webhook_server.py +++ b/scripts/ci/chatops/webhook_server.py @@ -417,7 +417,7 @@ def main(): import argparse parser = argparse.ArgumentParser(description="CI ChatOps Webhook 服务") - parser.add_argument("--port", type=int, default=config.WEBHOOK_PORT, help="监听端口") + parser.add_argument("--port", type=int, default=config.CHATOPS_WEBHOOK_PORT, help="监听端口") parser.add_argument("--host", default="0.0.0.0", help="监听地址") args = parser.parse_args()