Skip to content

Commit

Permalink
Merge branch 'main' into drew/log-level
Browse files Browse the repository at this point in the history
  • Loading branch information
drewvolz committed Sep 20, 2023
2 parents 9988f20 + c262a58 commit c7b3db1
Show file tree
Hide file tree
Showing 7 changed files with 21 additions and 21 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
run: |
rustup toolchain install ${{ matrix.rust }}
rustup default ${{ matrix.rust }}
- uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3
- uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4
- name: Run rustfmt
run: |
rustup component add rustfmt
Expand All @@ -39,7 +39,7 @@ jobs:
run: |
rustup toolchain install ${{ matrix.rust }}
rustup default ${{ matrix.rust }}
- uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3
- uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4
- name: Run cargo test
run: |
cargo test --workspace --all-features --all-targets --no-fail-fast
Expand Down
20 changes: 10 additions & 10 deletions Cargo.lock

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

4 changes: 2 additions & 2 deletions ccc-handlers/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ axum-macros = "0.3.8"
http = "0.2.9"
reqwest = { version = "0.11.20", features = ["json"] }
serde = { version = "1.0.188", features = ["derive"] }
serde_json = "1.0.105"
thiserror = { version = "1.0.47" }
serde_json = "1.0.107"
thiserror = { version = "1.0.48" }
tracing = "0.1.37"
serde_urlencoded = "0.7.1"
phf = { version = "0.11.2", features = ["macros"] }
6 changes: 3 additions & 3 deletions ccc-proxy/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@ publish = false

[dependencies]
axum = "0.6.20"
bytes = "1.4.0"
bytes = "1.5.0"
http = "0.2.9"
reqwest = { version = "0.11.20", features = ["json"] }
serde = { version = "1.0.188", features = ["derive"] }
serde_json = "1.0.105"
thiserror = { version = "1.0.47" }
serde_json = "1.0.107"
thiserror = { version = "1.0.48" }
tracing = "0.1.37"
2 changes: 1 addition & 1 deletion ccc-server/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,6 @@ reqwest = { version = "0.11.20", features = ["json"] }
serde = { version = "1.0.188", features = ["derive"] }
tokio = { version = "1.32.0", features = ["macros", "rt-multi-thread"] }
tower = { version = "0.4.13", features = ["filter", "timeout"] }
tower-http = { version = "0.4.3", features = ["trace"] }
tower-http = { version = "0.4.4", features = ["trace"] }
tracing = "0.1.37"
tracing-subscriber = { version = "0.3.17", features = ["json", "env-filter"] }
2 changes: 1 addition & 1 deletion ccc-types/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,5 @@ publish = false

[dependencies]
serde = { version = "1.0.188", features = ["derive"] }
serde_json = "1.0.105"
serde_json = "1.0.107"
ts-rs = {version = "7.0.0" }
4 changes: 2 additions & 2 deletions e2e/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@ edition = "2021"
tokio = { version = "1.32.0", features = ["macros", "rt-multi-thread"] }
reqwest = "0.11.20"
url = "2.4.1"
bytes = "1.4.0"
bytes = "1.5.0"
similar = "2.2.1"
serde_json = "1.0.105"
serde_json = "1.0.107"

0 comments on commit c7b3db1

Please sign in to comment.