chore: use xtask

hirosystems · Nov 15, 2023 · 3c26883 · 3c26883
1 parent 7a0a563
commit 3c26883
Show file tree

Hide file tree

Showing 11 changed files with 311 additions and 42 deletions.
diff --git a/.cargo/config b/.cargo/config
@@ -1,2 +1,3 @@
 [alias]
 clarinet-install = "install --path components/clarinet-cli --locked --force"
+xtask = "run --package xtask --"
diff --git a/.github/workflows/ci-clarinet-cli.yaml b/.github/workflows/ci-clarinet-cli.yaml
@@ -109,14 +109,8 @@ jobs:
         if: steps.cache-cargo.outputs.cache-hit != 'true'
         run: RUSTC_BOOTSTRAP=1 cargo install grcov
 
-      - name: Build & Unit Test
-        env:
-          RUSTFLAGS: "-C instrument-coverage"
-          LLVM_PROFILE_FILE: "${{ env.COMPONENT }}-%p-%m.profraw"
-        run: cargo test --workspace --locked --exclude clarinet-sdk-wasm --exclude clarity-jupyter-kernel
-
-      - name: Generate coverage
-        run: grcov . --binary-path target/debug/ -s . -t lcov --branch --ignore-not-existing --ignore "/*" -o lcov.info
+      - name: Unit Tests
+        run: cargo xtask coverage
 
       - name: Upload coverage report
         uses: codecov/codecov-action@v3

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -127,14 +127,8 @@ jobs:
         if: steps.cache-cargo.outputs.cache-hit != 'true'
         run: RUSTC_BOOTSTRAP=1 cargo install grcov
 
-      - name: Build & Unit Test
-        env:
-          RUSTFLAGS: "-C instrument-coverage"
-          LLVM_PROFILE_FILE: "${{ env.COMPONENT }}-%p-%m.profraw"
-        run: cargo test --workspace --locked --exclude clarinet-sdk-wasm --exclude clarity-jupyter-kernel
-
-      - name: Generate coverage
-        run: grcov . --binary-path target/debug/ -s . -t lcov --branch --ignore-not-existing --ignore "/*" -o lcov.info
+      - name: Unit Tests
+        run: cargo xtask coverage
 
       - name: Upload coverage report
         uses: codecov/codecov-action@v3

diff --git a/.gitignore b/.gitignore
@@ -1,4 +1,5 @@
 /target
+/coverage
 .DS_Store
 clarinet.code-workspace
 history.txt
@@ -18,3 +19,5 @@ components/stacks-devnet-js/build
 *.zip
 *.rdb
 *.lcov
+*.info
+*.profraw
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -2,7 +2,9 @@
   "rust-analyzer.check.overrideCommand": [
     "cargo",
     "clippy",
-    "--package=clarinet-cli",
+    "--workspace",
+    "--exclude=clarinet-sdk-wasm",
+    "--exclude=clarity-jupyter-kernel",
     "--message-format=json"
   ]
 }