Skip to content

Commit

Permalink
ci: resolve CI errors in shuttle-next (#580)
Browse files Browse the repository at this point in the history
* test: compile wasm module in axum runtime test setup

* ci: add next patch override to CI

* ci: include wasm32-wasi target in rust install

* fix: deployer tests where runtime fails to start

* fix: incorrect provisioner address

* feat: log service state changes in runtime

* feat: don't send stop req on startup failure

* refactor: unused imports

* refactor: handling legacy panics

* tests: deadlock less

* refactor: fixups

* refactor: clippy suggestions

* tests: mock provisioner

* refactor: restore capture from 'log' and colors

* refactor: clippy suggestions

* tests: longer wait

* tests: don't panic while holding lock

* tests: don't panic on stream closed

* tests: don't filter out state logs

* tests: bigger timeout

* ci: remove duplicate patch

* refactor: comments

---------

Co-authored-by: chesedo <pieter@chesedo.me>
  • Loading branch information
oddgrd and chesedo authored Mar 10, 2023
1 parent 4e1690d commit adf8926
Show file tree
Hide file tree
Showing 16 changed files with 549 additions and 384 deletions.
4 changes: 2 additions & 2 deletions admin/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ serde = { workspace = true, features = ["derive"] }
serde_json = { workspace = true }
tokio = { version = "1.22.0", features = ["macros", "rt-multi-thread"] }
toml = "0.5.9"
tracing = { workspace = true }
tracing-subscriber = { workspace = true, features = ["env-filter"] }
tracing = { workspace = true, features = ["default"] }
tracing-subscriber = { workspace = true, features = ["default", "env-filter"] }

[dependencies.shuttle-common]
workspace = true
Expand Down
4 changes: 2 additions & 2 deletions cargo-shuttle/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,8 @@ tokio-tungstenite = { version = "0.17.2", features = ["native-tls"] }
toml = "0.5.9"
toml_edit = "0.15.0"
tonic = { workspace = true }
tracing = { workspace = true }
tracing-subscriber = { workspace = true, features = ["env-filter", "fmt"] }
tracing = { workspace = true, features = ["default"] }
tracing-subscriber = { workspace = true, features = ["default", "env-filter", "fmt"] }
url = "2.3.1"
uuid = { workspace = true, features = ["v4"] }
webbrowser = "0.8.2"
Expand Down
2 changes: 1 addition & 1 deletion cargo-shuttle/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -510,7 +510,7 @@ impl Shuttle {
.into_inner();

tokio::spawn(async move {
while let Some(log) = stream.message().await.expect("to get log from stream") {
while let Ok(Some(log)) = stream.message().await {
let log: shuttle_common::LogItem = log.try_into().expect("to convert log");
println!("{log}");
}
Expand Down
4 changes: 2 additions & 2 deletions deployer/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -40,9 +40,9 @@ toml = "0.5.9"
tonic = { workspace = true }
tower = { version = "0.4.13", features = ["make"] }
tower-http = { version = "0.3.4", features = ["auth", "trace"] }
tracing = { workspace = true }
tracing = { workspace = true, features = ["default"] }
tracing-opentelemetry = "0.18.0"
tracing-subscriber = { workspace = true, features = ["env-filter", "fmt"] }
tracing-subscriber = { workspace = true, features = ["default", "env-filter", "fmt"] }
uuid = { workspace = true, features = ["v4"] }

[dependencies.shuttle-common]
Expand Down
Loading

0 comments on commit adf8926

Please sign in to comment.