Skip to content

Commit 9e60e15

Browse files
committed
Merge branch 'main' into fix-typos
2 parents f63dcaa + 4cf240f commit 9e60e15

File tree

387 files changed

+8390
-9180
lines changed

Some content is hidden

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

387 files changed

+8390
-9180
lines changed

.changeset/config.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"$schema": "https://unpkg.com/@changesets/[email protected]/schema.json",
33
"changelog": "./changelog-config.js",
44
"commit": false,
5-
"fixed": [],
5+
"fixed": [["roo-cline"]],
66
"linked": [],
77
"access": "restricted",
88
"baseBranch": "main",

.changeset/eager-buckets-feel.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"roo-cline": major
3+
---
4+
5+
Default enabled autoCondenseContext and moved settings out of Experimental

.changeset/spotty-steaks-brake.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+
Skips condense operations if the context size grows & shows an error

.github/scripts/overwrite_changeset_changelog.py

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

.github/workflows/code-qa.yml

Lines changed: 14 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -13,27 +13,6 @@ env:
1313
PNPM_VERSION: 10.8.1
1414

1515
jobs:
16-
compile:
17-
runs-on: ubuntu-latest
18-
steps:
19-
- name: Checkout code
20-
uses: actions/checkout@v4
21-
- name: Install pnpm
22-
uses: pnpm/action-setup@v4
23-
with:
24-
version: ${{ env.PNPM_VERSION }}
25-
- name: Setup Node.js
26-
uses: actions/setup-node@v4
27-
with:
28-
node-version: ${{ env.NODE_VERSION }}
29-
cache: 'pnpm'
30-
- name: Install dependencies
31-
run: pnpm install
32-
- name: Check types
33-
run: pnpm check-types
34-
- name: Lint
35-
run: pnpm lint
36-
3716
check-translations:
3817
runs-on: ubuntu-latest
3918
steps:
@@ -72,11 +51,8 @@ jobs:
7251
- name: Run knip checks
7352
run: pnpm knip
7453

75-
test-extension:
76-
runs-on: ${{ matrix.os }}
77-
strategy:
78-
matrix:
79-
os: [ubuntu-latest, windows-latest]
54+
compile:
55+
runs-on: ubuntu-latest
8056
steps:
8157
- name: Checkout code
8258
uses: actions/checkout@v4
@@ -91,11 +67,12 @@ jobs:
9167
cache: 'pnpm'
9268
- name: Install dependencies
9369
run: pnpm install
94-
- name: Run unit tests
95-
working-directory: src
96-
run: pnpm test
70+
- name: Lint
71+
run: pnpm lint
72+
- name: Check types
73+
run: pnpm check-types
9774

98-
test-webview:
75+
platform-unit-test:
9976
runs-on: ${{ matrix.os }}
10077
strategy:
10178
matrix:
@@ -115,16 +92,8 @@ jobs:
11592
- name: Install dependencies
11693
run: pnpm install
11794
- name: Run unit tests
118-
working-directory: webview-ui
11995
run: pnpm test
12096

121-
unit-test:
122-
needs: [test-extension, test-webview]
123-
runs-on: ubuntu-latest
124-
steps:
125-
- name: NO-OP
126-
run: echo "All unit tests passed."
127-
12897
check-openrouter-api-key:
12998
runs-on: ubuntu-latest
13099
outputs:
@@ -164,3 +133,10 @@ jobs:
164133
- name: Run integration tests
165134
working-directory: apps/vscode-e2e
166135
run: xvfb-run -a pnpm test:ci
136+
137+
qa:
138+
needs: [check-translations, knip, compile, platform-unit-test, integration-test]
139+
runs-on: ubuntu-latest
140+
steps:
141+
- name: NO-OP
142+
run: echo "All tests passed."

.github/workflows/marketplace-publish.yml

Lines changed: 16 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -45,15 +45,22 @@ jobs:
4545
run: |
4646
current_package_version=$(node -p "require('./src/package.json').version")
4747
pnpm build
48-
package=$(unzip -l bin/roo-cline-${current_package_version}.vsix)
49-
echo "$package" | grep -q "extension/package.json" || exit 1
50-
echo "$package" | grep -q "extension/package.nls.json" || exit 1
51-
echo "$package" | grep -q "extension/dist/extension.js" || exit 1
52-
echo "$package" | grep -q "extension/webview-ui/audio/celebration.wav" || exit 1
53-
echo "$package" | grep -q "extension/webview-ui/build/assets/index.js" || exit 1
54-
echo "$package" | grep -q "extension/assets/codicons/codicon.ttf" || exit 1
55-
echo "$package" | grep -q "extension/assets/vscode-material-icons/icons/3d.svg" || exit 1
56-
echo "$package" | grep -q ".env" || exit 1
48+
49+
# Save VSIX contents to a temporary file to avoid broken pipe issues.
50+
unzip -l bin/roo-cline-${current_package_version}.vsix > /tmp/roo-code-vsix-contents.txt
51+
52+
# Check for required files.
53+
grep -q "extension/package.json" /tmp/roo-code-vsix-contents.txt || exit 1
54+
grep -q "extension/package.nls.json" /tmp/roo-code-vsix-contents.txt || exit 1
55+
grep -q "extension/dist/extension.js" /tmp/roo-code-vsix-contents.txt || exit 1
56+
grep -q "extension/webview-ui/audio/celebration.wav" /tmp/roo-code-vsix-contents.txt || exit 1
57+
grep -q "extension/webview-ui/build/assets/index.js" /tmp/roo-code-vsix-contents.txt || exit 1
58+
grep -q "extension/assets/codicons/codicon.ttf" /tmp/roo-code-vsix-contents.txt || exit 1
59+
grep -q "extension/assets/vscode-material-icons/icons/3d.svg" /tmp/roo-code-vsix-contents.txt || exit 1
60+
grep -q ".env" /tmp/roo-code-vsix-contents.txt || exit 1
61+
62+
# Clean up temporary file.
63+
rm /tmp/roo-code-vsix-contents.txt
5764
- name: Create and Push Git Tag
5865
run: |
5966
current_package_version=$(node -p "require('./src/package.json').version")

.husky/pre-commit

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,6 @@ else
1616
fi
1717
fi
1818

19-
$pnpm_cmd --filter roo-cline generate-types
20-
21-
if [ -n "$(git diff --name-only src/exports/roo-code.d.ts)" ]; then
22-
echo "Error: There are unstaged changes to roo-code.d.ts after running 'pnpm --filter roo-cline generate-types'."
23-
echo "Please review and stage the changes before committing."
24-
exit 1
25-
fi
26-
2719
# Detect if running on Windows and use npx.cmd, otherwise use npx.
2820
if [ "$OS" = "Windows_NT" ]; then
2921
npx_cmd="npx.cmd"

.husky/pre-push

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ $pnpm_cmd run check-types
2222
NEW_CHANGESETS=$(find .changeset -name "*.md" ! -name "README.md" | wc -l | tr -d ' ')
2323
echo "Changeset files: $NEW_CHANGESETS"
2424

25-
if [ "$NEW_CHANGESETS" == "0" ]; then
25+
if [ "$NEW_CHANGESETS" = "0" ]; then
2626
echo "-------------------------------------------------------------------------------------"
2727
echo "Changes detected. Please run 'pnpm changeset' to create a changeset if applicable."
2828
echo "-------------------------------------------------------------------------------------"

.prettierignore

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

.prettierrc.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,6 @@
33
"useTabs": true,
44
"printWidth": 120,
55
"semi": false,
6-
"bracketSameLine": true
6+
"bracketSameLine": true,
7+
"ignore": ["node_modules", "dist", "build", "out", ".next", ".venv", "pnpm-lock.yaml"]
78
}

0 commit comments

Comments
 (0)