From ccd72ddff5c5dbba4699c7dd177902faa8daaa9c Mon Sep 17 00:00:00 2001 From: sugar-cat7 Date: Fri, 31 Jan 2025 02:11:18 +0900 Subject: [PATCH] chore: fix config --- .github/workflows/deploy-server-workers.yaml | 13 +++++-------- .../wrangler/api-gateway/wrangler.toml} | 0 .../wrangler/cron/wrangler.toml} | 0 .../wrangler/internal-app/wrangler.toml} | 2 +- 4 files changed, 6 insertions(+), 9 deletions(-) rename service/server/{api-gateway.wrangler.toml => config/wrangler/api-gateway/wrangler.toml} (100%) rename service/server/{cron.wrangler.toml => config/wrangler/cron/wrangler.toml} (100%) rename service/server/{internal-app.wrangler.toml => config/wrangler/internal-app/wrangler.toml} (91%) diff --git a/.github/workflows/deploy-server-workers.yaml b/.github/workflows/deploy-server-workers.yaml index 2ad894cf..5e89b34e 100644 --- a/.github/workflows/deploy-server-workers.yaml +++ b/.github/workflows/deploy-server-workers.yaml @@ -15,12 +15,8 @@ jobs: strategy: matrix: include: - # - config: "api-gateway.wrangler.toml" - # name: "vspo-portal-api-gateway" - - config: "internal-app.wrangler.toml" - name: "vspo-portal-internal-app" - - config: "cron.wrangler.toml" - name: "vspo-portal-cron" + - name: "internal-app" + - name: "cron" steps: - uses: actions/checkout@v4 - uses: pnpm/action-setup@v4 @@ -35,8 +31,9 @@ jobs: apiToken: ${{ secrets.CLOUDFLARE_API_TOKEN }} accountId: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }} packageManager: pnpm - workingDirectory: service/server - command: deploy --name ${{ matrix.name }} --config ${{ matrix.config }} + workingDirectory: service/server/config/wrangler/${{ matrix.name }} + command: deploy --config wrangler.toml + quiet: true secrets: | OPENAI_ORGANIZATION OPENAI_PROJECT diff --git a/service/server/api-gateway.wrangler.toml b/service/server/config/wrangler/api-gateway/wrangler.toml similarity index 100% rename from service/server/api-gateway.wrangler.toml rename to service/server/config/wrangler/api-gateway/wrangler.toml diff --git a/service/server/cron.wrangler.toml b/service/server/config/wrangler/cron/wrangler.toml similarity index 100% rename from service/server/cron.wrangler.toml rename to service/server/config/wrangler/cron/wrangler.toml diff --git a/service/server/internal-app.wrangler.toml b/service/server/config/wrangler/internal-app/wrangler.toml similarity index 91% rename from service/server/internal-app.wrangler.toml rename to service/server/config/wrangler/internal-app/wrangler.toml index 626731fe..7ef6ee92 100644 --- a/service/server/internal-app.wrangler.toml +++ b/service/server/config/wrangler/internal-app/wrangler.toml @@ -2,7 +2,7 @@ name = "vspo-portal-app" compatibility_date = "2024-10-22" send_metrics = false compatibility_flags = ["nodejs_compat", "nodejs_als"] -main = "cmd/server/internal/application/index.ts" +main = "../../../cmd/server/internal/application/index.ts" tail_consumers = [{ service = "api-tail" }] logpush = true