Skip to content

Commit 77ae24f

Browse files
author
aheizi
committed
Merge branch 'main' into batch_clear_history
2 parents d088dda + 4ce2664 commit 77ae24f

File tree

152 files changed

+8130
-3404
lines changed

Some content is hidden

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

152 files changed

+8130
-3404
lines changed
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+
Update GitHub Actions workflow to automatically create and push git tags during release

.changeset/lemon-bulldogs-unite.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+
App tab layout fixes

.changeset/seven-apricots-watch.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+
ContextProxy fix - constructor should not be async

.changeset/thin-fans-deliver.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 prompt caching to OpenAI-compatible custom model info

.changeset/tidy-queens-pay.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+
Fix usage tracking for SiliconFlow etc

.env.sample

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1 @@
1-
# PostHog API Keys for telemetry
2-
POSTHOG_API_KEY=key-goes-here
1+
POSTHOG_API_KEY=key-goes-here

.eslintrc.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,5 +19,5 @@
1919
"no-throw-literal": "warn",
2020
"semi": "off"
2121
},
22-
"ignorePatterns": ["out", "dist", "**/*.d.ts"]
22+
"ignorePatterns": ["out", "dist", "**/*.d.ts", "!roo-code.d.ts"]
2323
}

.github/workflows/changeset-release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ jobs:
3737
cache: 'npm'
3838

3939
- name: Install Dependencies
40-
run: npm run install:ci
40+
run: npm run install:all
4141

4242
# Check if there are any new changesets to process
4343
- name: Check for changesets

.github/workflows/code-qa.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
node-version: '18'
2121
cache: 'npm'
2222
- name: Install dependencies
23-
run: npm run install:ci
23+
run: npm run install:all
2424
- name: Compile
2525
run: npm run compile
2626
- name: Check types
@@ -39,7 +39,7 @@ jobs:
3939
node-version: '18'
4040
cache: 'npm'
4141
- name: Install dependencies
42-
run: npm run install:ci
42+
run: npm run install:all
4343
- name: Run knip checks
4444
run: npm run knip
4545

@@ -54,7 +54,7 @@ jobs:
5454
node-version: '18'
5555
cache: 'npm'
5656
- name: Install dependencies
57-
run: npm run install:ci
57+
run: npm run install:all
5858
- name: Run unit tests
5959
run: npx jest --silent
6060

@@ -69,7 +69,7 @@ jobs:
6969
node-version: '18'
7070
cache: 'npm'
7171
- name: Install dependencies
72-
run: npm run install:ci
72+
run: npm run install:all
7373
- name: Run unit tests
7474
working-directory: webview-ui
7575
run: npx jest --silent
@@ -109,10 +109,10 @@ jobs:
109109
node-version: '18'
110110
cache: 'npm'
111111
- name: Install dependencies
112-
run: npm run install:ci
113-
- name: Create env.integration file
112+
run: npm run install:all
113+
- name: Create .env.local file
114114
working-directory: e2e
115-
run: echo "OPENROUTER_API_KEY=${{ secrets.OPENROUTER_API_KEY }}" > .env.integration
115+
run: echo "OPENROUTER_API_KEY=${{ secrets.OPENROUTER_API_KEY }}" > .env.local
116116
- name: Run integration tests
117117
working-directory: e2e
118118
run: xvfb-run -a npm run ci

.github/workflows/marketplace-publish.yml

Lines changed: 20 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@ env:
1010
jobs:
1111
publish-extension:
1212
runs-on: ubuntu-latest
13+
permissions:
14+
contents: write # Required for pushing tags.
1315
if: >
1416
( github.event_name == 'pull_request' &&
1517
github.event.pull_request.base.ref == 'main' &&
@@ -23,24 +25,20 @@ jobs:
2325
- uses: actions/setup-node@v4
2426
with:
2527
node-version: 18
28+
2629
- run: |
2730
git config user.name github-actions
2831
git config user.email [email protected]
32+
2933
- name: Install Dependencies
3034
run: |
3135
npm install -g vsce ovsx
32-
npm run install:ci
36+
npm run install:all
3337
- name: Create .env file
34-
run: |
35-
echo "# PostHog API Keys for telemetry" > .env
36-
echo "POSTHOG_API_KEY=${{ secrets.POSTHOG_API_KEY }}" >> .env
37-
- name: Package and Publish Extension
38-
env:
39-
VSCE_PAT: ${{ secrets.VSCE_PAT }}
40-
OVSX_PAT: ${{ secrets.OVSX_PAT }}
38+
run: echo "POSTHOG_API_KEY=${{ secrets.POSTHOG_API_KEY }}" >> .env
39+
- name: Package Extension
4140
run: |
4241
current_package_version=$(node -p "require('./package.json').version")
43-
4442
npm run vsix
4543
package=$(unzip -l bin/roo-cline-${current_package_version}.vsix)
4644
echo "$package"
@@ -49,5 +47,18 @@ jobs:
4947
echo "$package" | grep -q "extension/node_modules/@vscode/codicons/dist/codicon.ttf" || exit 1
5048
echo "$package" | grep -q ".env" || exit 1
5149
50+
- name: Create and Push Git Tag
51+
run: |
52+
current_package_version=$(node -p "require('./package.json').version")
53+
git tag -a "v${current_package_version}" -m "Release v${current_package_version}"
54+
git push origin "v${current_package_version}"
55+
echo "Successfully created and pushed git tag v${current_package_version}"
56+
57+
- name: Publish Extension
58+
env:
59+
VSCE_PAT: ${{ secrets.VSCE_PAT }}
60+
OVSX_PAT: ${{ secrets.OVSX_PAT }}
61+
run: |
62+
current_package_version=$(node -p "require('./package.json').version")
5263
npm run publish:marketplace
5364
echo "Successfully published version $current_package_version to VS Code Marketplace"

0 commit comments

Comments
 (0)