Skip to content
Merged
39 changes: 32 additions & 7 deletions .github/workflows/deploy-mcp-on-merge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,35 @@ on:
- master # Trigger only on pushes to the master branch

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 }}
deploy-mcp-worker:
name: Deploy Worker (mcp-server)
runs-on: ubuntu-latest
environment: production
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_WORKER_TOKEN }}
accountId: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }}
workingDirectory: "./mcp-server"
command: deploy
40 changes: 0 additions & 40 deletions .github/workflows/deploy-mcp-server.yml

This file was deleted.

34 changes: 25 additions & 9 deletions .github/workflows/master.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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)
uses: cloudflare/wrangler-action@v3
with:
CLOUDFLARE_API_TOKEN: ${{ secrets.CLOUDFLARE_API_TOKEN }}
CLOUDFLARE_ACCOUNT_ID: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }}
apiToken: ${{ secrets.CLOUDFLARE_WORKER_TOKEN }}
accountId: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }}
workingDirectory: "./mcp-server"
command: deploy
24 changes: 24 additions & 0 deletions .github/workflows/pull-request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -163,3 +163,27 @@ jobs:
`- E2E Tests: ${e2eStatus}\n\n` +
`Please check the workflow logs for details.`
});

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
2 changes: 1 addition & 1 deletion mcp-server/README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# remote-mcp-server-authless
# 10x Rules MCP Server

## 1. Project Description

Expand Down
4 changes: 2 additions & 2 deletions mcp-server/package.json
Original file line number Diff line number Diff line change
@@ -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",
Expand Down