Skip to content

Commit e287517

Browse files
committed
Merge branch 'main' into cte/benchmarks
2 parents ce34f1f + 8ce5f9a commit e287517

33 files changed

+961
-358
lines changed

.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/workflows/code-qa.yml

Lines changed: 31 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,55 @@ 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+
integration-test:
47+
strategy:
48+
matrix:
49+
os: [ubuntu-latest] # macos-latest, windows-latest
50+
runs-on: ${{ matrix.os }}
51+
steps:
52+
- name: Checkout code
53+
uses: actions/checkout@v4
54+
- name: Setup Node.js
55+
uses: actions/setup-node@v4
56+
with:
57+
node-version: '18'
58+
cache: 'npm'
59+
- name: Create env.integration file
60+
run: echo "OPENROUTER_API_KEY=${{ secrets.OPENROUTER_API_KEY }}" > .env.integration
61+
- name: Check env.integration file
62+
run: cat .env.integration
63+
- name: Install dependencies
64+
run: npm run install:all
65+
- run: xvfb-run -a npm run test:integration
66+
if: runner.os == 'Linux'
67+
- run: npm run test:integration
68+
if: runner.os != 'Linux'

.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: 5 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

@@ -16,5 +17,8 @@ roo-cline-*.vsix
1617
.test_env
1718
.vscode-test/
1819

20+
# Docs
21+
docs/_site/
22+
1923
# Dotenv
2024
.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

.vscode-test.mjs

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,16 @@
1+
/**
2+
* See: https://code.visualstudio.com/api/working-with-extensions/testing-extension
3+
*/
4+
15
import { defineConfig } from '@vscode/test-cli';
26

37
export default defineConfig({
4-
files: 'src/test/extension.test.ts',
8+
label: 'integrationTest',
9+
files: 'out-integration/test/**/*.test.js',
510
workspaceFolder: '.',
611
mocha: {
12+
ui: 'tdd',
713
timeout: 60000,
8-
ui: 'tdd'
914
},
1015
launchArgs: [
1116
'--enable-proposed-api=RooVeterinaryInc.roo-cline',

CHANGELOG.md

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,16 @@
11
# Roo Code Changelog
22

3+
## [3.3.7]
4+
5+
- Support for o3-mini (thanks @shpigunov!)
6+
- Code Action improvements to allow selecting code and adding it to context, plus bug fixes (thanks @samhvw8!)
7+
- Ability to include a message when approving or rejecting tool use (thanks @napter!)
8+
- Improvements to chat input box styling (thanks @psv2522!)
9+
- Capture reasoning from more variants of DeepSeek R1 (thanks @Szpadel!)
10+
- Use an exponential backoff for API retries (if delay after first error is 5s, delay after second consecutive error will be 10s, then 20s, etc)
11+
- Add a slider in advanced settings to enable rate limiting requests to avoid overloading providers (i.e. wait at least 10 seconds between API requests)
12+
- Prompt tweaks to make Roo better at creating new custom modes for you
13+
314
## [3.3.6]
415

516
- Add a "new task" tool that allows Roo to start new tasks with an initial message and mode

docs/Gemfile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
source 'https://rubygems.org'
2+
gem 'github-pages', group: :jekyll_plugins

0 commit comments

Comments
 (0)