Merge pull request #2391 from CosmWasm/co/fix-coverage

Fix codecov job

Author: chipshort

.circleci/config.yml

@@ -1,8 +1,7 @@
 version: 2.1
 
 orbs:
-  codecov: codecov/[email protected]
-  win: circleci/[email protected]
+  win: circleci/[email protected]
 
 commands:
   check_contract:
@@ -1182,58 +1181,77 @@ jobs:
   coverage:
     docker:
       - image: rust:1.84.1-alpine3.21
-    environment:
-      # Limit the number of parallel jobs to avoid OOM crashes during doc testing
-      RUST_TEST_THREADS: 8
     resource_class: medium+
     steps:
       - checkout
       - run:
           name: Install necessary packages
           command: |
             apk update
-            apk add mold clang curl coreutils gnupg llvm19-dev zlib-static clang19-static
+            # needed for grcov and compiling tests
+            apk add --no-cache mold clang curl llvm19-dev zlib-static clang19-static lcov
       - run:
-          name: Install grcov
+          name: Install cargo-llvm-cov and cargo-nextest
           command: |
             rustup component add llvm-tools-preview
-            cargo install grcov --locked
+
+            # cargo-nextest
+            curl -L --proto '=https' --tlsv1.2 -OsSf https://github.com/nextest-rs/nextest/releases/download/cargo-nextest-0.9.92/cargo-nextest-0.9.92-x86_64-unknown-linux-musl.tar.gz
+            tar -xzf cargo-nextest-0.9.92-x86_64-unknown-linux-musl.tar.gz
+            mv cargo-nextest /usr/local/bin/
+
+            # cargo-llvm-cov
+            curl -L --proto '=https' --tlsv1.2 -OsSf https://github.com/taiki-e/cargo-llvm-cov/releases/download/v0.6.16/cargo-llvm-cov-x86_64-unknown-linux-musl.tar.gz
+            tar -xzf cargo-llvm-cov-x86_64-unknown-linux-musl.tar.gz
+            mv cargo-llvm-cov /usr/local/bin/
+      - run:
+          name: Install CodeCov CLI
+          command: |
+            curl -L --proto '=https' --tlsv1.2 -OsSf https://cli.codecov.io/v10.1.1/alpine/codecov
+            chmod +x codecov
       - run:
           name: Run tests with coverage
           command: |
-            mkdir -p reports
-            cargo test --all-features
+            # Generate full coverage report
+            cargo llvm-cov nextest --lcov --output-path lcov.info
+
+            # List of package directories and their flags
+            set -- \
+              "check:cosmwasm-check" \
+              "core:cosmwasm-core" \
+              "crypto:cosmwasm-crypto" \
+              "derive:cosmwasm-derive" \
+              "schema:cosmwasm-schema" \
+              "schema-derive:cosmwasm-schema-derive" \
+              "std:cosmwasm-std" \
+              "vm:cosmwasm-vm" \
+              "vm-derive:cosmwasm-vm-derive"
+
+            # Process each package-flag pair
+            for entry in "$@"; do
+              dir="${entry%%:*}"
+              flag="${entry#*:}"
 
-            grcov . -s packages/core --binary-path ./target/debug -t lcov -o ./reports/core.info
-            grcov . -s packages/crypto --binary-path ./target/debug -t lcov -o ./reports/crypto.info
-            grcov . -s packages/derive --binary-path ./target/debug -t lcov -o ./reports/derive.info
-            grcov . -s packages/schema --binary-path ./target/debug -t lcov -o ./reports/schema.info
-            grcov . -s packages/std --binary-path ./target/debug -t lcov -o ./reports/std.info
-            grcov . -s packages/vm --binary-path ./target/debug -t lcov -o ./reports/vm.info
+              echo "Processing directory: $dir with flag: $flag"
+
+              # Extract coverage for specific directory using lcov
+              lcov \
+                --ignore-errors empty,unused \
+                --extract lcov.info "packages/$dir/**/*" \
+                --output-file "lcov-$dir.info"
+
+              # Upload filtered report
+              ./codecov upload-coverage -t "$CODECOV_TOKEN" \
+                --disable-search \
+                --git-service github \
+                --pr "${CIRCLE_PULL_REQUEST##*/}" \
+                --branch "$CIRCLE_BRANCH" \
+                --sha "$CIRCLE_SHA1" \
+                -f "lcov-$dir.info" \
+                -F "$flag"
+            done
           environment:
-            RUSTFLAGS: "-Clinker=clang -Clink-arg=-fuse-ld=/usr/bin/mold -Cinstrument-coverage"
-            LLVM_PROFILE_FILE: "cosmwasm-%p-%m.profraw"
-      - run:
-          name: Quick fix for GPG error in Codecov
-          command: mkdir -p ~/.gnupg
-      - codecov/upload:
-          file: reports/core.info
-          flags: cosmwasm-core
-      - codecov/upload:
-          file: reports/crypto.info
-          flags: cosmwasm-crypto
-      - codecov/upload:
-          file: reports/derive.info
-          flags: cosmwasm-derive
-      - codecov/upload:
-          file: reports/schema.info
-          flags: cosmwasm-schema
-      - codecov/upload:
-          file: reports/std.info
-          flags: cosmwasm-std
-      - codecov/upload:
-          file: reports/vm.info
-          flags: cosmwasm-vm
+            RUSTFLAGS: "-Clinker=clang -Clink-arg=-fuse-ld=/usr/bin/mold"
 
   # This job roughly follows the instructions from https://circleci.com/blog/publishing-to-github-releases-via-circleci/
   build_and_upload_devcontracts:

codecov.yml

@@ -9,12 +9,16 @@ coverage:
       default:
         threshold: 0.05%
 
-ignore:
-  - "contracts"
-  # Disabled due to "cargo_tarpaulin: Failed to get test coverage! Error: Failed to run tests: Error running test - SIGILL raised in 5835"
-  - "packages/vm"
+fixes:
+  - "/root/project/::" # reduce root, e.g. "/root/project/path/" => "path/"
 
 flags:
+  cosmwasm-check:
+    paths:
+      - packages/check/
+  cosmwasm-core:
+    paths:
+      - packages/core/
   cosmwasm-crypto:
     paths:
       - packages/crypto/
@@ -30,3 +34,9 @@ flags:
   cosmwasm-std:
     paths:
       - packages/std/
+  cosmwasm-vm:
+    paths:
+      - packages/vm/
+  cosmwasm-vm-derive:
+    paths:
+      - packages/vm-derive/