Skip to content

Commit 98dfb31

Browse files
authored
Merge branch 'main' into feature/import-roo-history-3rocsalfk3hja
2 parents 31b6a82 + 48e1592 commit 98dfb31

764 files changed

Lines changed: 27950 additions & 52191 deletions

File tree

Some content is hidden

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

.github/ISSUE_TEMPLATE/feature_request.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ body:
6464
attributes:
6565
value: |
6666
---
67-
Optional (for contributors): You can stop here if you're just proposing the improvement.
67+
Optional: You can stop here if you're just proposing the improvement.
6868
6969
- type: textarea
7070
id: acceptance-criteria

.github/actions/setup-node-pnpm/action.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ inputs:
66
node-version:
77
description: "Node.js version to use"
88
required: false
9-
default: "20.19.2"
9+
default: "20.20.2"
1010
pnpm-version:
1111
description: "pnpm version to use"
1212
required: false
@@ -24,22 +24,22 @@ runs:
2424
using: "composite"
2525
steps:
2626
- name: Install pnpm
27-
uses: pnpm/action-setup@v4
27+
uses: pnpm/action-setup@b906affcce14559ad1aafd4ab0e942779e9f58b1 # v4
2828
with:
2929
version: ${{ inputs.pnpm-version }}
3030
- name: Get pnpm store directory
3131
shell: bash
3232
run: |
3333
echo "STORE_PATH=$(pnpm store path --silent)" >> $GITHUB_ENV
3434
- name: Setup pnpm cache
35-
uses: actions/cache@v4
35+
uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 # v4
3636
with:
3737
path: ${{ env.STORE_PATH }}
3838
key: ${{ runner.os }}-pnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }}
3939
restore-keys: |
4040
${{ runner.os }}-pnpm-store-
4141
- name: Setup Node.js
42-
uses: actions/setup-node@v4
42+
uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4
4343
with:
4444
node-version: ${{ inputs.node-version }}
4545
- name: Install dependencies

.github/dependabot.yml

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

.github/workflows/changeset-release.yml

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

.github/workflows/cli-release.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ jobs:
3434

3535
steps:
3636
- name: Checkout code
37-
uses: actions/checkout@v4
37+
uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4
3838
with:
3939
fetch-depth: 0
4040

@@ -195,7 +195,7 @@ jobs:
195195
rm -rf "$VERIFY_DIR"
196196
197197
- name: Upload artifact
198-
uses: actions/upload-artifact@v4
198+
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4
199199
with:
200200
name: cli-${{ matrix.platform }}
201201
path: |
@@ -213,7 +213,7 @@ jobs:
213213

214214
steps:
215215
- name: Checkout code
216-
uses: actions/checkout@v4
216+
uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4
217217

218218
- name: Get version
219219
id: version
@@ -227,7 +227,7 @@ jobs:
227227
echo "tag=cli-v$VERSION" >> $GITHUB_OUTPUT
228228
229229
- name: Download all artifacts
230-
uses: actions/download-artifact@v4
230+
uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4
231231
with:
232232
path: artifacts
233233

@@ -373,7 +373,7 @@ jobs:
373373

374374
steps:
375375
- name: Download all artifacts
376-
uses: actions/download-artifact@v4
376+
uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4
377377
with:
378378
path: artifacts
379379

.github/workflows/code-qa.yml

Lines changed: 53 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,15 @@ on:
66
branches: [main]
77
pull_request:
88
types: [opened, reopened, ready_for_review, synchronize]
9+
merge_group:
10+
types: [checks_requested]
911

1012
jobs:
1113
check-translations:
1214
runs-on: ubuntu-latest
1315
steps:
1416
- name: Checkout code
15-
uses: actions/checkout@v4
17+
uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4
1618
- name: Setup Node.js and pnpm
1719
uses: ./.github/actions/setup-node-pnpm
1820
- name: Verify all translations are complete
@@ -22,7 +24,7 @@ jobs:
2224
runs-on: ubuntu-latest
2325
steps:
2426
- name: Checkout code
25-
uses: actions/checkout@v4
27+
uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4
2628
- name: Setup Node.js and pnpm
2729
uses: ./.github/actions/setup-node-pnpm
2830
- name: Run knip checks
@@ -32,7 +34,7 @@ jobs:
3234
runs-on: ubuntu-latest
3335
steps:
3436
- name: Checkout code
35-
uses: actions/checkout@v4
37+
uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4
3638
- name: Setup Node.js and pnpm
3739
uses: ./.github/actions/setup-node-pnpm
3840
- name: Lint
@@ -49,33 +51,73 @@ jobs:
4951
- os: ubuntu-latest
5052
name: ubuntu-latest
5153
codecov-flag: ubuntu
54+
upload-coverage: true
5255
- os: windows-latest
5356
name: windows-latest
5457
codecov-flag: windows
58+
upload-coverage: false
5559
steps:
5660
- name: Checkout code
57-
uses: actions/checkout@v4
61+
uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4
5862
- name: Setup Node.js and pnpm
5963
uses: ./.github/actions/setup-node-pnpm
60-
- name: Cache Turbo
61-
uses: actions/cache@v4
64+
- name: Restore Turbo cache
65+
id: turbo-cache
66+
uses: actions/cache/restore@0057852bfaa89a56745cba8c7296529d2fc39830 # v4
6267
with:
6368
path: .turbo/cache
6469
key: ${{ runner.os }}-turbo-${{ hashFiles('**/pnpm-lock.yaml') }}-${{ github.sha }}
6570
restore-keys: |
6671
${{ runner.os }}-turbo-${{ hashFiles('**/pnpm-lock.yaml') }}-
6772
${{ runner.os }}-turbo-
68-
- name: Run unit tests with coverage
69-
run: pnpm test:coverage
70-
- name: Upload coverage to Codecov
71-
uses: codecov/codecov-action@v4
73+
- name: Run non-core coverage
74+
run: pnpm turbo run test:coverage --filter="!@roo-code/core" --log-order grouped --output-logs new-only
75+
- name: Run core unit coverage
76+
run: pnpm turbo run test:coverage:unit --filter="@roo-code/core" --log-order grouped --output-logs new-only
77+
- name: Run core integration coverage
78+
run: pnpm turbo run test:coverage:integration --filter="@roo-code/core" --log-order grouped --output-logs new-only
79+
- name: Save Turbo cache
80+
if: steps.turbo-cache.outputs.cache-hit != 'true'
81+
uses: actions/cache/save@0057852bfaa89a56745cba8c7296529d2fc39830 # v4
82+
with:
83+
path: .turbo/cache
84+
key: ${{ steps.turbo-cache.outputs.cache-primary-key }}
85+
# Only ubuntu uploads coverage. Windows still runs the same test
86+
# lanes for behavioral confidence, but duplicating coverage uploads
87+
# there mostly adds Codecov overhead without changing pass/fail
88+
# behavior.
89+
# Coverage is uploaded in three separate steps so each LCOV gets the
90+
# correct flag set. Codecov double-counts overlapping lines when a
91+
# single upload carries multiple flags whose paths overlap, so the
92+
# two core lanes (which both cover packages/core/src/**) must be
93+
# uploaded individually with their own lane flag.
94+
# See https://docs.codecov.com/docs/flags
95+
- name: Upload non-core coverage to Codecov
96+
if: matrix.upload-coverage
97+
uses: codecov/codecov-action@b9fd7d16f6d7d1b5d2bec1a2887e65ceed900238 # v4
7298
with:
7399
files: >-
74100
src/coverage/lcov.info,
75101
webview-ui/coverage/lcov.info,
76-
packages/core/coverage/lcov.info,
77102
packages/cloud/coverage/lcov.info,
78103
packages/telemetry/coverage/lcov.info,
79104
apps/cli/coverage/lcov.info
105+
disable_search: true
80106
flags: ${{ matrix.codecov-flag }}
81107
token: ${{ secrets.CODECOV_TOKEN }}
108+
- name: Upload core unit coverage to Codecov
109+
if: matrix.upload-coverage
110+
uses: codecov/codecov-action@b9fd7d16f6d7d1b5d2bec1a2887e65ceed900238 # v4
111+
with:
112+
files: packages/core/coverage/unit/lcov.info
113+
disable_search: true
114+
flags: ${{ matrix.codecov-flag }},core-unit
115+
token: ${{ secrets.CODECOV_TOKEN }}
116+
- name: Upload core integration coverage to Codecov
117+
if: matrix.upload-coverage
118+
uses: codecov/codecov-action@b9fd7d16f6d7d1b5d2bec1a2887e65ceed900238 # v4
119+
with:
120+
files: packages/core/coverage/integration/lcov.info
121+
disable_search: true
122+
flags: ${{ matrix.codecov-flag }},core-integration
123+
token: ${{ secrets.CODECOV_TOKEN }}

.github/workflows/codeql.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,11 +43,11 @@ jobs:
4343
# your codebase is analyzed, see https://docs.github.com/en/code-security/code-scanning/creating-an-advanced-setup-for-code-scanning/codeql-code-scanning-for-compiled-languages
4444
steps:
4545
- name: Checkout repository
46-
uses: actions/checkout@v4
46+
uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4
4747

4848
# Initializes the CodeQL tools for scanning.
4949
- name: Initialize CodeQL
50-
uses: github/codeql-action/init@v3
50+
uses: github/codeql-action/init@03e4368ac7daa2bd82b3e85262f3bf87ee112f57 # v3
5151
with:
5252
languages: ${{ matrix.language }}
5353
build-mode: ${{ matrix.build-mode }}
@@ -75,6 +75,6 @@ jobs:
7575
exit 1
7676
7777
- name: Perform CodeQL Analysis
78-
uses: github/codeql-action/analyze@v3
78+
uses: github/codeql-action/analyze@03e4368ac7daa2bd82b3e85262f3bf87ee112f57 # v3
7979
with:
8080
category: "/language:${{matrix.language}}"

0 commit comments

Comments
 (0)