Thanks to visit codestin.com
Credit goes to github.com

Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
78 changes: 39 additions & 39 deletions .github/workflows/rust.yml
Original file line number Diff line number Diff line change
Expand Up @@ -75,46 +75,46 @@ jobs:
- name: Run tests
run: cargo test --locked --workspace --lib --bins --test '*' --exclude fig_desktop-fuzz

cargo-clippy-windows-chat-cli:
name: Clippy Windows (chat_cli)
runs-on: windows-latest
timeout-minutes: 60
steps:
- uses: actions/checkout@v4
- uses: dtolnay/[email protected]
id: toolchain
with:
components: clippy
- uses: actions/cache@v4
with:
path: |
~/.cargo/registry/index/
~/.cargo/registry/cache/
~/.cargo/git/db/
target/
key: cargo-clippy-windows-chat-cli-${{ hashFiles('**/Cargo.lock') }}-${{ steps.toolchain.outputs.cachekey }}
- run: cargo clippy --locked -p chat_cli --color always -- -D warnings
# cargo-clippy-windows-chat-cli:
# name: Clippy Windows (chat_cli)
# runs-on: windows-latest
# timeout-minutes: 60
# steps:
# - uses: actions/checkout@v4
# - uses: dtolnay/[email protected]
# id: toolchain
# with:
# components: clippy
# - uses: actions/cache@v4
# with:
# path: |
# ~/.cargo/registry/index/
# ~/.cargo/registry/cache/
# ~/.cargo/git/db/
# target/
# key: cargo-clippy-windows-chat-cli-${{ hashFiles('**/Cargo.lock') }}-${{ steps.toolchain.outputs.cachekey }}
# - run: cargo clippy --locked -p chat_cli --color always -- -D warnings

cargo-test-windows-chat-cli:
name: Test Windows (chat_cli)
runs-on: windows-latest
timeout-minutes: 60
steps:
- uses: actions/checkout@v4
- uses: dtolnay/rust-toolchain@nightly
id: toolchain
with:
components: llvm-tools-preview
- uses: actions/cache@v4
with:
path: |
~/.cargo/registry/index/
~/.cargo/registry/cache/
~/.cargo/git/db/
target/
key: cargo-test-windows-chat-cli-${{ hashFiles('**/Cargo.lock') }}-${{ steps.toolchain.outputs.cachekey }}
- name: Run tests
run: cargo test --locked -p chat_cli
# cargo-test-windows-chat-cli:
# name: Test Windows (chat_cli)
# runs-on: windows-latest
# timeout-minutes: 60
# steps:
# - uses: actions/checkout@v4
# - uses: dtolnay/rust-toolchain@nightly
# id: toolchain
# with:
# components: llvm-tools-preview
# - uses: actions/cache@v4
# with:
# path: |
# ~/.cargo/registry/index/
# ~/.cargo/registry/cache/
# ~/.cargo/git/db/
# target/
# key: cargo-test-windows-chat-cli-${{ hashFiles('**/Cargo.lock') }}-${{ steps.toolchain.outputs.cachekey }}
# - name: Run tests
# run: cargo test --locked -p chat_cli

cargo-fmt:
name: Fmt
Expand Down
2 changes: 2 additions & 0 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ version = "1.19.3"
license = "MIT OR Apache-2.0"

[workspace.dependencies]
agent = { path = "crates/agent" }
amzn-codewhisperer-client = { path = "crates/amzn-codewhisperer-client" }
amzn-codewhisperer-streaming-client = { path = "crates/amzn-codewhisperer-streaming-client" }
amzn-consolas-client = { path = "crates/amzn-consolas-client" }
Expand Down Expand Up @@ -112,6 +113,7 @@ tempfile = "3.18.0"
thiserror = "2.0.12"
time = { version = "0.3.39", features = ["parsing", "formatting", "local-offset", "macros", "serde"] }
tokio = { version = "1.45.0", features = ["full"] }
tokio-stream = { version = "0.1.17", features = ["io-util"] }
tokio-tungstenite = "0.26.2"
tokio-util = { version = "0.7.15", features = ["codec", "compat"] }
toml = "0.8.12"
Expand Down
2 changes: 1 addition & 1 deletion crates/agent/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ tempfile.workspace = true
thiserror.workspace = true
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It looks like this file is the only change in the agent crate.
Do we not also need to delete stuff from it (the stuff that you had copied over from chat-cli crate).

time.workspace = true
tokio.workspace = true
tokio-stream = { version = "0.1.17", features = ["io-util"] }
tokio-stream.workspace = true
tokio-util.workspace = true
tracing.workspace = true
tracing-appender = "0.2.3"
Expand Down
2 changes: 2 additions & 0 deletions crates/chat-cli/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ default = []
wayland = ["arboard/wayland-data-control"]

[dependencies]
agent.workspace = true
amzn-codewhisperer-client.workspace = true
amzn-codewhisperer-streaming-client.workspace = true
amzn-consolas-client.workspace = true
Expand Down Expand Up @@ -102,6 +103,7 @@ tempfile.workspace = true
thiserror.workspace = true
time.workspace = true
tokio.workspace = true
tokio-stream.workspace = true
tokio-tungstenite.workspace = true
tokio-util.workspace = true
toml.workspace = true
Expand Down
1 change: 1 addition & 0 deletions crates/chat-cli/src/agent/mod.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
mod rts;
Loading