Skip to content

Commit

Permalink
Merge pull request #8 from YOU54F/fix_logging_plus_fork_master
Browse files Browse the repository at this point in the history
Fix logging plus fork master
  • Loading branch information
YOU54F authored Jun 8, 2024
2 parents c58b110 + 8379914 commit c1aa22f
Show file tree
Hide file tree
Showing 11 changed files with 146 additions and 96 deletions.
6 changes: 6 additions & 0 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,12 @@ jobs:
env:
RUST_LOG: debug
RUST_BACKTRACE: 1
- name: Run mock_server_logs test
run: cargo test -p pact_ffi returns_mock_server_logs -- --nocapture --include-ignored
working-directory: rust
env:
RUST_LOG: debug
RUST_BACKTRACE: 1
- name: Build Components
run: cargo build
working-directory: rust
Expand Down
8 changes: 5 additions & 3 deletions compatibility-suite/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ lazy_static = "1.4.0"
maplit = "1.0.2"
pact_models = { version = "~1.2.1", path = "../rust/pact_models" }
pact_matching = { version = "1.2.3", path = "../rust/pact_matching" }
pact_mock_server = { version = "1.2.8" }
pact_mock_server = { version = "1.2.9" }
pact_verifier = { version = "1.2.1", path = "../rust/pact_verifier" }
pact_consumer = { version = "1.2.0", path = "../rust/pact_consumer" }
pretty_assertions = "1.4.0"
Expand All @@ -26,8 +26,8 @@ serde = { version = "1.0", features = ["derive"] }
serde_json = "1.0.108"
sxd-document = "0.3.2"
tokio = { version = "1.33.0", features = ["full"] }
tracing = "0.1.40"
tracing-subscriber = { version = "0.3.17", features = ["env-filter", "tracing-log", "fmt"] }
tracing = "=0.1.40"
tracing-subscriber = { version = "=0.3.18", features = ["env-filter", "tracing-log", "fmt"] }
uuid = { version = "1.5.0", features = ["v4"] }

[[test]]
Expand Down Expand Up @@ -65,3 +65,5 @@ harness = false
[patch.crates-io]
pact_matching = { path = "../rust/pact_matching" }
pact_models = { path = "../rust/pact_models" }
pact_mock_server = { git = 'https://github.com/you54f/pact-core-mock-server.git', branch = "fix/logging_min" }
pact-plugin-driver = { git = 'https://github.com/you54f/pact-plugins.git', branch = "fix/logging_min" }
Loading

0 comments on commit c1aa22f

Please sign in to comment.