Skip to content

Commit ec3df25

Browse files
committed
Merge remote-tracking branch 'origin/main' into add-command-fixes-from-cline
2 parents a67ba83 + 6da0559 commit ec3df25

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

67 files changed

+3099
-1035
lines changed

.changeset/blue-masks-camp.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"roo-cline": patch
3+
---
4+
5+
Add shortcuts to the currently open tabs in the "Add File" section of @-mentions (thanks @olup!)
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"roo-cline": patch
3+
---
4+
5+
Visual cleanup to the list of modes on the prompts tab

.changeset/tame-walls-kiss.md

Lines changed: 0 additions & 5 deletions
This file was deleted.

.env.integration.example

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
OPENROUTER_API_KEY=sk-or-v1-...

.github/CODEOWNERS

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
# These owners will be the default owners for everything in the repo
2-
* @stea9499 @ColemanRoo @mrubens
2+
* @stea9499 @ColemanRoo @mrubens @cte

.github/workflows/code-qa.yml

Lines changed: 41 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
name: Code QA Roo Code
22

33
on:
4+
workflow_dispatch:
45
push:
56
branches: [main]
67
pull_request:
@@ -13,33 +14,65 @@ jobs:
1314
steps:
1415
- name: Checkout code
1516
uses: actions/checkout@v4
16-
1717
- name: Setup Node.js
1818
uses: actions/setup-node@v4
1919
with:
2020
node-version: '18'
2121
cache: 'npm'
22-
2322
- name: Install dependencies
2423
run: npm run install:all
25-
26-
- name: Compile TypeScript
24+
- name: Compile
2725
run: npm run compile
26+
- name: Check types
27+
run: npm run check-types
28+
- name: Lint
29+
run: npm run lint
2830

2931
unit-test:
3032
runs-on: ubuntu-latest
3133
steps:
3234
- name: Checkout code
3335
uses: actions/checkout@v4
34-
3536
- name: Setup Node.js
3637
uses: actions/setup-node@v4
3738
with:
3839
node-version: '18'
3940
cache: 'npm'
40-
4141
- name: Install dependencies
4242
run: npm run install:all
43-
4443
- name: Run unit tests
45-
run: npm test
44+
run: npm test
45+
46+
check-openrouter-api-key:
47+
runs-on: ubuntu-latest
48+
outputs:
49+
exists: ${{ steps.openrouter-api-key-check.outputs.defined }}
50+
steps:
51+
- name: Check if OpenRouter API key exists
52+
id: openrouter-api-key-check
53+
shell: bash
54+
run: |
55+
if [ "${{ secrets.OPENROUTER_API_KEY }}" != '' ]; then
56+
echo "defined=true" >> $GITHUB_OUTPUT;
57+
else
58+
echo "defined=false" >> $GITHUB_OUTPUT;
59+
fi
60+
61+
integration-test:
62+
runs-on: ubuntu-latest
63+
needs: [check-openrouter-api-key]
64+
if: needs.check-openrouter-api-key.outputs.exists == 'true'
65+
steps:
66+
- name: Checkout code
67+
uses: actions/checkout@v4
68+
- name: Setup Node.js
69+
uses: actions/setup-node@v4
70+
with:
71+
node-version: '18'
72+
cache: 'npm'
73+
- name: Create env.integration file
74+
run: echo "OPENROUTER_API_KEY=${{ secrets.OPENROUTER_API_KEY }}" > .env.integration
75+
- name: Install dependencies
76+
run: npm run install:all
77+
- name: Run integration tests
78+
run: xvfb-run -a npm run test:integration
Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
name: Discord PR Notifier
2+
3+
on:
4+
workflow_dispatch:
5+
pull_request_target:
6+
types: [opened]
7+
8+
jobs:
9+
notify:
10+
runs-on: ubuntu-latest
11+
if: github.head_ref != 'changeset-release/main'
12+
steps:
13+
- name: Send Discord Notification
14+
run: |
15+
PAYLOAD=$(jq -n \
16+
--arg title "${{ github.event.pull_request.title }}" \
17+
--arg url "${{ github.event.pull_request.html_url }}" \
18+
--arg author "${{ github.event.pull_request.user.login }}" \
19+
'{
20+
content: ("🚀 **New PR:** " + $title + "\n🔗 <" + $url + ">\n👤 **Author:** " + $author),
21+
thread_name: ($title + " by " + $author)
22+
}')
23+
24+
curl -X POST "${{ secrets.DISCORD_WEBHOOK }}" \
25+
-H "Content-Type: application/json" \
26+
-d "$PAYLOAD"

.github/workflows/pages.yml

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
name: Deploy Jekyll site to Pages
2+
3+
on:
4+
push:
5+
branches: ["main"]
6+
workflow_dispatch:
7+
8+
permissions:
9+
contents: read
10+
pages: write
11+
id-token: write
12+
13+
concurrency:
14+
group: "pages"
15+
cancel-in-progress: false
16+
17+
jobs:
18+
# Build job
19+
build:
20+
runs-on: ubuntu-latest
21+
steps:
22+
- name: Checkout
23+
uses: actions/checkout@v4
24+
- name: Setup Pages
25+
uses: actions/configure-pages@v5
26+
- name: Build with Jekyll
27+
uses: actions/jekyll-build-pages@v1
28+
with:
29+
source: ./docs/
30+
destination: ./_site
31+
- name: Upload artifact
32+
uses: actions/upload-pages-artifact@v3
33+
34+
# Deployment job
35+
deploy:
36+
environment:
37+
name: github-pages
38+
url: ${{ steps.deployment.outputs.page_url }}
39+
runs-on: ubuntu-latest
40+
needs: build
41+
steps:
42+
- name: Deploy to GitHub Pages
43+
id: deployment
44+
uses: actions/deploy-pages@v4

.gitignore

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
1-
out
21
dist
2+
out
3+
out-integration
34
node_modules
45
coverage/
56

@@ -15,3 +16,9 @@ roo-cline-*.vsix
1516
# Test environment
1617
.test_env
1718
.vscode-test/
19+
20+
# Docs
21+
docs/_site/
22+
23+
# Dotenv
24+
.env.integration

.husky/pre-commit

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,7 @@ if [ "$branch" = "main" ]; then
66
fi
77

88
npx lint-staged
9+
910
npm run compile
11+
npm run lint
12+
npm run check-types

0 commit comments

Comments
 (0)