From 0dae8ff4a11876b81fdda8476b9dde216beb5f23 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9Cmkczarkowski=E2=80=9D?= Date: Sun, 27 Apr 2025 17:06:51 +0200 Subject: [PATCH 01/12] fix: stop using nonexistent option --- .github/workflows/deploy-mcp-server.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/deploy-mcp-server.yml b/.github/workflows/deploy-mcp-server.yml index 0d7d3db..a9ef810 100644 --- a/.github/workflows/deploy-mcp-server.yml +++ b/.github/workflows/deploy-mcp-server.yml @@ -37,4 +37,4 @@ jobs: env: CLOUDFLARE_API_TOKEN: ${{ secrets.CLOUDFLARE_API_TOKEN }} CLOUDFLARE_ACCOUNT_ID: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }} - run: cd mcp-server && npx wrangler deploy --account-id ${{ secrets.CLOUDFLARE_ACCOUNT_ID }} # Assumes wrangler.jsonc is configured \ No newline at end of file + run: cd mcp-server && npx wrangler deploy # Assumes wrangler.jsonc is configured \ No newline at end of file From 452a9d5f9d392f07d4c87f05f2837f9572ddfe3f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9Cmkczarkowski=E2=80=9D?= Date: Sun, 27 Apr 2025 17:08:53 +0200 Subject: [PATCH 02/12] fix: update package name --- mcp-server/README.md | 2 +- mcp-server/package.json | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/mcp-server/README.md b/mcp-server/README.md index 3ef7f68..a610871 100644 --- a/mcp-server/README.md +++ b/mcp-server/README.md @@ -1,4 +1,4 @@ -# remote-mcp-server-authless +# 10x Rules MCP Server ## 1. Project Description diff --git a/mcp-server/package.json b/mcp-server/package.json index 363f0f0..055c0f3 100644 --- a/mcp-server/package.json +++ b/mcp-server/package.json @@ -1,6 +1,6 @@ { - "name": "remote-mcp-server-authless", - "version": "0.0.0", + "name": "10x-rules-mcp-server", + "version": "0.0.1", "private": true, "scripts": { "deploy": "wrangler deploy", From 32dd55c7ef87dc9b5b0c13cf5cd676f11cdf081e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9Cmkczarkowski=E2=80=9D?= Date: Sun, 27 Apr 2025 17:10:43 +0200 Subject: [PATCH 03/12] chore: add deploy to pull request workflow --- .github/workflows/pull-request.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml index 9a7b4bf..d8badf3 100644 --- a/.github/workflows/pull-request.yml +++ b/.github/workflows/pull-request.yml @@ -163,3 +163,11 @@ jobs: `- E2E Tests: ${e2eStatus}\n\n` + `Please check the workflow logs for details.` }); + + deploy: + name: Deploy MCP Server + uses: ./.github/workflows/deploy-mcp-server.yml + # Pass secrets explicitly to the called workflow's 'secrets' input + secrets: + CLOUDFLARE_API_TOKEN: ${{ secrets.CLOUDFLARE_API_TOKEN }} + CLOUDFLARE_ACCOUNT_ID: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }} \ No newline at end of file From 238943a5591ebc9f219795ceb28f50911c39fcd6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9Cmkczarkowski=E2=80=9D?= Date: Sun, 27 Apr 2025 17:13:30 +0200 Subject: [PATCH 04/12] fix: indentation --- .github/workflows/pull-request.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml index d8badf3..6018870 100644 --- a/.github/workflows/pull-request.yml +++ b/.github/workflows/pull-request.yml @@ -165,9 +165,9 @@ jobs: }); deploy: - name: Deploy MCP Server - uses: ./.github/workflows/deploy-mcp-server.yml - # Pass secrets explicitly to the called workflow's 'secrets' input - secrets: - CLOUDFLARE_API_TOKEN: ${{ secrets.CLOUDFLARE_API_TOKEN }} - CLOUDFLARE_ACCOUNT_ID: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }} \ No newline at end of file + name: Deploy MCP Server + uses: ./.github/workflows/deploy-mcp-server.yml + # Pass secrets explicitly to the called workflow's 'secrets' input + secrets: + CLOUDFLARE_API_TOKEN: ${{ secrets.CLOUDFLARE_API_TOKEN }} + CLOUDFLARE_ACCOUNT_ID: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }} \ No newline at end of file From 2023e53f7f0b9c6f00cf57871bea4afb98ffe96a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9Cmkczarkowski=E2=80=9D?= Date: Sun, 27 Apr 2025 17:17:28 +0200 Subject: [PATCH 05/12] fix: use run to get access to secrets --- .github/workflows/deploy-mcp-server.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/deploy-mcp-server.yml b/.github/workflows/deploy-mcp-server.yml index a9ef810..a0df6d9 100644 --- a/.github/workflows/deploy-mcp-server.yml +++ b/.github/workflows/deploy-mcp-server.yml @@ -37,4 +37,6 @@ jobs: env: CLOUDFLARE_API_TOKEN: ${{ secrets.CLOUDFLARE_API_TOKEN }} CLOUDFLARE_ACCOUNT_ID: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }} - run: cd mcp-server && npx wrangler deploy # Assumes wrangler.jsonc is configured \ No newline at end of file + run: | + echo "Attempting deployment..." + cd mcp-server && npx wrangler deploy \ No newline at end of file From 3f1300aca7b0615ee3ba2fd0a776a3ff95b8566b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9Cmkczarkowski=E2=80=9D?= Date: Sun, 27 Apr 2025 17:22:04 +0200 Subject: [PATCH 06/12] inherit secrets --- .github/workflows/deploy-mcp-on-merge.yml | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/.github/workflows/deploy-mcp-on-merge.yml b/.github/workflows/deploy-mcp-on-merge.yml index da1c7ef..3a78eef 100644 --- a/.github/workflows/deploy-mcp-on-merge.yml +++ b/.github/workflows/deploy-mcp-on-merge.yml @@ -8,8 +8,11 @@ on: jobs: deploy: name: Deploy MCP Server + permissions: + contents: read # Explicitly set read permissions uses: ./.github/workflows/deploy-mcp-server.yml # Pass secrets explicitly to the called workflow's 'secrets' input - secrets: - CLOUDFLARE_API_TOKEN: ${{ secrets.CLOUDFLARE_API_TOKEN }} - CLOUDFLARE_ACCOUNT_ID: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }} \ No newline at end of file + # secrets: + # CLOUDFLARE_API_TOKEN: ${{ secrets.CLOUDFLARE_API_TOKEN }} + # CLOUDFLARE_ACCOUNT_ID: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }} + secrets: inherit # Inherit secrets from the caller \ No newline at end of file From 7d65dd05ebf2dd893f1b1fd9d0bbc03cbd3152a7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9Cmkczarkowski=E2=80=9D?= Date: Sun, 27 Apr 2025 17:29:40 +0200 Subject: [PATCH 07/12] chore: use copy-paste approach instead of separated workflow --- .github/workflows/deploy-mcp-on-merge.yml | 41 +++++++++++++++++------ .github/workflows/master.yml | 30 +++++++++++++---- .github/workflows/pull-request.yml | 38 +++++++++++++++++---- 3 files changed, 85 insertions(+), 24 deletions(-) diff --git a/.github/workflows/deploy-mcp-on-merge.yml b/.github/workflows/deploy-mcp-on-merge.yml index 3a78eef..868bbca 100644 --- a/.github/workflows/deploy-mcp-on-merge.yml +++ b/.github/workflows/deploy-mcp-on-merge.yml @@ -6,13 +6,34 @@ on: - master # Trigger only on pushes to the master branch jobs: - deploy: - name: Deploy MCP Server - permissions: - contents: read # Explicitly set read permissions - uses: ./.github/workflows/deploy-mcp-server.yml - # Pass secrets explicitly to the called workflow's 'secrets' input - # secrets: - # CLOUDFLARE_API_TOKEN: ${{ secrets.CLOUDFLARE_API_TOKEN }} - # CLOUDFLARE_ACCOUNT_ID: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }} - secrets: inherit # Inherit secrets from the caller \ No newline at end of file + deploy-mcp-worker: + name: Deploy Worker (mcp-server) + runs-on: ubuntu-latest + steps: + - name: Checkout repository + uses: actions/checkout@v4 + + # We need Node.js to generate rules and run wrangler/npm + - name: Set up Node.js + uses: actions/setup-node@v4 + with: + node-version-file: '.nvmrc' # Assuming .nvmrc is in the root + cache: 'npm' + cache-dependency-path: '**/package-lock.json' # Cache npm deps for root and worker + + - name: Install root dependencies + run: npm ci + + - name: Generate preparedRules.json + run: npm run generate-rules # Assuming direct execution works + + - name: Install worker dependencies + run: cd mcp-server && npm ci + + - name: Deploy Worker (mcp-server) + env: + CLOUDFLARE_API_TOKEN: ${{ secrets.CLOUDFLARE_API_TOKEN }} + CLOUDFLARE_ACCOUNT_ID: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }} + run: | + echo "Attempting deployment..." + cd mcp-server && npx wrangler deploy \ No newline at end of file diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml index 842b878..2d5033a 100644 --- a/.github/workflows/master.yml +++ b/.github/workflows/master.yml @@ -86,18 +86,34 @@ jobs: command: pages deploy dist --project-name='ai-rules-builder' # Use the command input gitHubToken: ${{ secrets.GITHUB_TOKEN }} # Optional: Adds commit details to deployments - deploy-worker: - name: Deploy Worker - needs: deploy # Run after successful pages deployment + deploy-mcp-worker: + name: Deploy Worker (mcp-server) runs-on: ubuntu-latest - permissions: - contents: read # Needed to checkout the repository steps: - name: Checkout repository uses: actions/checkout@v4 - - name: Call Deploy Worker Workflow - uses: ./.github/workflows/deploy-mcp-server.yml + # We need Node.js to generate rules and run wrangler/npm + - name: Set up Node.js + uses: actions/setup-node@v4 with: + node-version-file: '.nvmrc' # Assuming .nvmrc is in the root + cache: 'npm' + cache-dependency-path: '**/package-lock.json' # Cache npm deps for root and worker + + - name: Install root dependencies + run: npm ci + + - name: Generate preparedRules.json + run: npm run generate-rules # Assuming direct execution works + + - name: Install worker dependencies + run: cd mcp-server && npm ci + + - name: Deploy Worker (mcp-server) + env: CLOUDFLARE_API_TOKEN: ${{ secrets.CLOUDFLARE_API_TOKEN }} CLOUDFLARE_ACCOUNT_ID: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }} + run: | + echo "Attempting deployment..." + cd mcp-server && npx wrangler deploy diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml index 6018870..881e947 100644 --- a/.github/workflows/pull-request.yml +++ b/.github/workflows/pull-request.yml @@ -164,10 +164,34 @@ jobs: `Please check the workflow logs for details.` }); - deploy: - name: Deploy MCP Server - uses: ./.github/workflows/deploy-mcp-server.yml - # Pass secrets explicitly to the called workflow's 'secrets' input - secrets: - CLOUDFLARE_API_TOKEN: ${{ secrets.CLOUDFLARE_API_TOKEN }} - CLOUDFLARE_ACCOUNT_ID: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }} \ No newline at end of file + deploy-mcp-worker: + name: Deploy Worker (mcp-server) + runs-on: ubuntu-latest + steps: + - name: Checkout repository + uses: actions/checkout@v4 + + # We need Node.js to generate rules and run wrangler/npm + - name: Set up Node.js + uses: actions/setup-node@v4 + with: + node-version-file: '.nvmrc' # Assuming .nvmrc is in the root + cache: 'npm' + cache-dependency-path: '**/package-lock.json' # Cache npm deps for root and worker + + - name: Install root dependencies + run: npm ci + + - name: Generate preparedRules.json + run: npm run generate-rules # Assuming direct execution works + + - name: Install worker dependencies + run: cd mcp-server && npm ci + + - name: Deploy Worker (mcp-server) + env: + CLOUDFLARE_API_TOKEN: ${{ secrets.CLOUDFLARE_API_TOKEN }} + CLOUDFLARE_ACCOUNT_ID: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }} + run: | + echo "Attempting deployment..." + cd mcp-server && npx wrangler deploy From ff735901956e11de5c8c37270d36fc8a79dd572f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9Cmkczarkowski=E2=80=9D?= Date: Sun, 27 Apr 2025 17:33:18 +0200 Subject: [PATCH 08/12] fix: use builtin wrangler action --- .github/workflows/deploy-mcp-server.yml | 10 ++++------ .github/workflows/master.yml | 10 ++++------ .github/workflows/pull-request.yml | 10 ++++------ 3 files changed, 12 insertions(+), 18 deletions(-) diff --git a/.github/workflows/deploy-mcp-server.yml b/.github/workflows/deploy-mcp-server.yml index a0df6d9..d1bc56d 100644 --- a/.github/workflows/deploy-mcp-server.yml +++ b/.github/workflows/deploy-mcp-server.yml @@ -34,9 +34,7 @@ jobs: run: cd mcp-server && npm ci - name: Deploy Worker (mcp-server) - env: - CLOUDFLARE_API_TOKEN: ${{ secrets.CLOUDFLARE_API_TOKEN }} - CLOUDFLARE_ACCOUNT_ID: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }} - run: | - echo "Attempting deployment..." - cd mcp-server && npx wrangler deploy \ No newline at end of file + uses: cloudflare/wrangler-action@v3 + with: + apiToken: ${{ secrets.CLOUDFLARE_API_TOKEN }} + workingDirectory: "./mcp-server" \ No newline at end of file diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml index 2d5033a..c412064 100644 --- a/.github/workflows/master.yml +++ b/.github/workflows/master.yml @@ -111,9 +111,7 @@ jobs: run: cd mcp-server && npm ci - name: Deploy Worker (mcp-server) - env: - CLOUDFLARE_API_TOKEN: ${{ secrets.CLOUDFLARE_API_TOKEN }} - CLOUDFLARE_ACCOUNT_ID: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }} - run: | - echo "Attempting deployment..." - cd mcp-server && npx wrangler deploy + uses: cloudflare/wrangler-action@v3 + with: + apiToken: ${{ secrets.CLOUDFLARE_API_TOKEN }} + workingDirectory: "./mcp-server" diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml index 881e947..76d04a9 100644 --- a/.github/workflows/pull-request.yml +++ b/.github/workflows/pull-request.yml @@ -189,9 +189,7 @@ jobs: run: cd mcp-server && npm ci - name: Deploy Worker (mcp-server) - env: - CLOUDFLARE_API_TOKEN: ${{ secrets.CLOUDFLARE_API_TOKEN }} - CLOUDFLARE_ACCOUNT_ID: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }} - run: | - echo "Attempting deployment..." - cd mcp-server && npx wrangler deploy + uses: cloudflare/wrangler-action@v3 + with: + apiToken: ${{ secrets.CLOUDFLARE_API_TOKEN }} + workingDirectory: "./mcp-server" From b94619437f28e42b14e131872fa197a106a4b6fb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9Cmkczarkowski=E2=80=9D?= Date: Sun, 27 Apr 2025 17:40:07 +0200 Subject: [PATCH 09/12] fix: use dedicated worker token --- .github/workflows/deploy-mcp-on-merge.yml | 10 +++--- .github/workflows/deploy-mcp-server.yml | 40 ----------------------- .github/workflows/master.yml | 2 +- .github/workflows/pull-request.yml | 2 +- 4 files changed, 6 insertions(+), 48 deletions(-) delete mode 100644 .github/workflows/deploy-mcp-server.yml diff --git a/.github/workflows/deploy-mcp-on-merge.yml b/.github/workflows/deploy-mcp-on-merge.yml index 868bbca..4055d3b 100644 --- a/.github/workflows/deploy-mcp-on-merge.yml +++ b/.github/workflows/deploy-mcp-on-merge.yml @@ -31,9 +31,7 @@ jobs: run: cd mcp-server && npm ci - name: Deploy Worker (mcp-server) - env: - CLOUDFLARE_API_TOKEN: ${{ secrets.CLOUDFLARE_API_TOKEN }} - CLOUDFLARE_ACCOUNT_ID: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }} - run: | - echo "Attempting deployment..." - cd mcp-server && npx wrangler deploy \ No newline at end of file + uses: cloudflare/wrangler-action@v3 + with: + apiToken: ${{ secrets.CLOUDFLARE_WORKER_TOKEN }} + workingDirectory: "./mcp-server" \ No newline at end of file diff --git a/.github/workflows/deploy-mcp-server.yml b/.github/workflows/deploy-mcp-server.yml deleted file mode 100644 index d1bc56d..0000000 --- a/.github/workflows/deploy-mcp-server.yml +++ /dev/null @@ -1,40 +0,0 @@ -name: Deploy MCP Server Worker - -on: - workflow_call: - secrets: - CLOUDFLARE_API_TOKEN: - required: true - CLOUDFLARE_ACCOUNT_ID: - required: true - -jobs: - deploy-worker: - name: Deploy Worker (mcp-server) - runs-on: ubuntu-latest - steps: - - name: Checkout repository - uses: actions/checkout@v4 - - # We need Node.js to generate rules and run wrangler/npm - - name: Set up Node.js - uses: actions/setup-node@v4 - with: - node-version-file: '.nvmrc' # Assuming .nvmrc is in the root - cache: 'npm' - cache-dependency-path: '**/package-lock.json' # Cache npm deps for root and worker - - - name: Install root dependencies - run: npm ci - - - name: Generate preparedRules.json - run: npm run generate-rules # Assuming direct execution works - - - name: Install worker dependencies - run: cd mcp-server && npm ci - - - name: Deploy Worker (mcp-server) - uses: cloudflare/wrangler-action@v3 - with: - apiToken: ${{ secrets.CLOUDFLARE_API_TOKEN }} - workingDirectory: "./mcp-server" \ No newline at end of file diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml index c412064..af15027 100644 --- a/.github/workflows/master.yml +++ b/.github/workflows/master.yml @@ -113,5 +113,5 @@ jobs: - name: Deploy Worker (mcp-server) uses: cloudflare/wrangler-action@v3 with: - apiToken: ${{ secrets.CLOUDFLARE_API_TOKEN }} + apiToken: ${{ secrets.CLOUDFLARE_WORKER_TOKEN }} workingDirectory: "./mcp-server" diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml index 76d04a9..1742780 100644 --- a/.github/workflows/pull-request.yml +++ b/.github/workflows/pull-request.yml @@ -191,5 +191,5 @@ jobs: - name: Deploy Worker (mcp-server) uses: cloudflare/wrangler-action@v3 with: - apiToken: ${{ secrets.CLOUDFLARE_API_TOKEN }} + apiToken: ${{ secrets.CLOUDFLARE_WORKER_TOKEN }} workingDirectory: "./mcp-server" From 062c922e0db7f317b81024922f7b87678f56e262 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9Cmkczarkowski=E2=80=9D?= Date: Sun, 27 Apr 2025 17:43:50 +0200 Subject: [PATCH 10/12] fix: adjust secrets --- .github/workflows/deploy-mcp-on-merge.yml | 7 +++++-- .github/workflows/master.yml | 4 +++- .github/workflows/pull-request.yml | 4 +++- 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/.github/workflows/deploy-mcp-on-merge.yml b/.github/workflows/deploy-mcp-on-merge.yml index 4055d3b..d521b0b 100644 --- a/.github/workflows/deploy-mcp-on-merge.yml +++ b/.github/workflows/deploy-mcp-on-merge.yml @@ -9,6 +9,7 @@ jobs: deploy-mcp-worker: name: Deploy Worker (mcp-server) runs-on: ubuntu-latest + environment: production steps: - name: Checkout repository uses: actions/checkout@v4 @@ -33,5 +34,7 @@ jobs: - name: Deploy Worker (mcp-server) uses: cloudflare/wrangler-action@v3 with: - apiToken: ${{ secrets.CLOUDFLARE_WORKER_TOKEN }} - workingDirectory: "./mcp-server" \ No newline at end of file + apiToken: ${{ secrets.CLOUDFLARE_API_TOKEN }} + accountId: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }} + workingDirectory: "./mcp-server" + command: deploy \ No newline at end of file diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml index af15027..900b0d4 100644 --- a/.github/workflows/master.yml +++ b/.github/workflows/master.yml @@ -113,5 +113,7 @@ jobs: - name: Deploy Worker (mcp-server) uses: cloudflare/wrangler-action@v3 with: - apiToken: ${{ secrets.CLOUDFLARE_WORKER_TOKEN }} + apiToken: ${{ secrets.CLOUDFLARE_API_TOKEN }} + accountId: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }} workingDirectory: "./mcp-server" + command: deploy diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml index 1742780..a08f48d 100644 --- a/.github/workflows/pull-request.yml +++ b/.github/workflows/pull-request.yml @@ -191,5 +191,7 @@ jobs: - name: Deploy Worker (mcp-server) uses: cloudflare/wrangler-action@v3 with: - apiToken: ${{ secrets.CLOUDFLARE_WORKER_TOKEN }} + apiToken: ${{ secrets.CLOUDFLARE_API_TOKEN }} + accountId: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }} workingDirectory: "./mcp-server" + command: deploy From 9d803871543da44e50cb8ac27f1b97415ab0ba83 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9Cmkczarkowski=E2=80=9D?= Date: Sun, 27 Apr 2025 17:46:11 +0200 Subject: [PATCH 11/12] fix: add secret as repo secret --- .github/workflows/deploy-mcp-on-merge.yml | 2 +- .github/workflows/master.yml | 2 +- .github/workflows/pull-request.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/deploy-mcp-on-merge.yml b/.github/workflows/deploy-mcp-on-merge.yml index d521b0b..188ba10 100644 --- a/.github/workflows/deploy-mcp-on-merge.yml +++ b/.github/workflows/deploy-mcp-on-merge.yml @@ -34,7 +34,7 @@ jobs: - name: Deploy Worker (mcp-server) uses: cloudflare/wrangler-action@v3 with: - apiToken: ${{ secrets.CLOUDFLARE_API_TOKEN }} + apiToken: ${{ secrets.CLOUDFLARE_WORKER_TOKEN }} accountId: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }} workingDirectory: "./mcp-server" command: deploy \ No newline at end of file diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml index 900b0d4..7f1c52b 100644 --- a/.github/workflows/master.yml +++ b/.github/workflows/master.yml @@ -113,7 +113,7 @@ jobs: - name: Deploy Worker (mcp-server) uses: cloudflare/wrangler-action@v3 with: - apiToken: ${{ secrets.CLOUDFLARE_API_TOKEN }} + apiToken: ${{ secrets.CLOUDFLARE_WORKER_TOKEN }} accountId: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }} workingDirectory: "./mcp-server" command: deploy diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml index a08f48d..964ccc2 100644 --- a/.github/workflows/pull-request.yml +++ b/.github/workflows/pull-request.yml @@ -191,7 +191,7 @@ jobs: - name: Deploy Worker (mcp-server) uses: cloudflare/wrangler-action@v3 with: - apiToken: ${{ secrets.CLOUDFLARE_API_TOKEN }} + apiToken: ${{ secrets.CLOUDFLARE_WORKER_TOKEN }} accountId: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }} workingDirectory: "./mcp-server" command: deploy From da5fe08a15af27a77c4325f8d1089fb23d47d987 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9Cmkczarkowski=E2=80=9D?= Date: Sun, 27 Apr 2025 17:47:38 +0200 Subject: [PATCH 12/12] chore: remove worker deploy from pr workflow --- .github/workflows/pull-request.yml | 8 -------- 1 file changed, 8 deletions(-) diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml index 964ccc2..689493f 100644 --- a/.github/workflows/pull-request.yml +++ b/.github/workflows/pull-request.yml @@ -187,11 +187,3 @@ jobs: - name: Install worker dependencies run: cd mcp-server && npm ci - - - name: Deploy Worker (mcp-server) - uses: cloudflare/wrangler-action@v3 - with: - apiToken: ${{ secrets.CLOUDFLARE_WORKER_TOKEN }} - accountId: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }} - workingDirectory: "./mcp-server" - command: deploy