chore: linting fixed and coverage should work

madara-alliance · Jan 28, 2025 · a9d5e34 · a9d5e34
1 parent 493ed59
commit a9d5e34
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 19 deletions.
diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml
@@ -46,16 +46,10 @@ jobs:
           PROPTEST_CASES: 10
         run: |
           source <(cargo llvm-cov show-env --export-prefix)
-          # Only build madara crates
-          cargo build --bin madara --profile dev \
-            --package "mc-*" \
-            --package "mp-*"
+          cargo build --bin madara --profile dev
           export COVERAGE_BIN=$(realpath target/debug/madara)
           rm -f target/madara-* lcov.info
-          # Only test madara crates
-          cargo test --profile dev \
-            --package "mc-*" \
-            --package "mp-*"
+          cargo test --profile dev --workspace --exclude=orchestrator --exclude=e2e-tests
 
       - name: Generate coverage info
         run: |

diff --git a/.github/workflows/orchestrator-coverage.yml b/.github/workflows/orchestrator-coverage.yml
@@ -141,15 +141,9 @@ jobs:
             --lcov \
             --output-path lcov.info \
             --test-threads=1 \
-            --package "orchestrator" \
-            --package "da-client-interface" \
-            --package "atlantic-service" \
-            --package "sharp-service" \
-            --package "prover-client-interface" \
-            --package "gps-fact-checker" \
-            --package "settlement-client-interface" \
-            --package "utils" \
-            --no-fail-fast
+            --workspace \
+            --exclude=madara \
+            --exclude=e2e-tests
 
       - name: Coveralls
         uses: coverallsapp/github-action@v2

diff --git a/Cargo.toml b/Cargo.toml
@@ -40,7 +40,7 @@ members = [
   "orchestrator/crates/settlement-clients/settlement-client-interface",
   "orchestrator/crates/settlement-clients/ethereum",
   "orchestrator/crates/settlement-clients/starknet",
-  "e2e-tests", # TODO: rename / merge with existing tests
+  "e2e-tests",                                                          # TODO: rename / merge with existing tests
 ]
 resolver = "2"
 # Everything except test-related packages, so that they are not compiled when doing `cargo build`.

diff --git a/orchestrator/crates/orchestrator/Cargo.toml b/orchestrator/crates/orchestrator/Cargo.toml
@@ -111,4 +111,3 @@ testing = []
 hyper = { version = "0.14", features = ["full"] }
 rstest = { workspace = true }
 httpmock = { version = "0.8.0-alpha.1", features = ["proxy", "remote"] }
-
Original file line number	Diff line number	Diff line change
Expand Up		@@ -111,4 +111,3 @@ testing = []
		hyper = { version = "0.14", features = ["full"] }
		rstest = { workspace = true }
		httpmock = { version = "0.8.0-alpha.1", features = ["proxy", "remote"] }