Merge pull request #26 from timkpaine/dependabot/github_actions/codecov/codecov-action-5

Bump codecov/codecov-action from 4 to 5

Author: timkpaine

.config/nextest.toml

@@ -0,0 +1,2 @@
+[profile.default.junit]
+path = "junit.xml"

.github/workflows/build.yml

@@ -71,7 +71,7 @@ jobs:
       if: ${{ matrix.os == 'ubuntu-latest' }}
 
     - name: Test
-      run: make tests-ci
+      run: make coverage
       if: ${{ matrix.os == 'ubuntu-latest' }}
 
     - name: Upload test results
@@ -80,12 +80,10 @@ jobs:
         check_name: Test Results
         github_token: ${{ secrets.GITHUB_TOKEN }}
         files: |
-          rust/junit.xml
-          js/junit.xml
-          python/junit.xml
+          **/junit.xml
       if: ${{ matrix.os == 'ubuntu-latest' }}
 
     - name: Upload coverage
-      uses: codecov/codecov-action@v4
+      uses: codecov/codecov-action@v5
       if: ${{ matrix.os == 'ubuntu-latest' }}
 

Makefile

@@ -1,5 +1,5 @@
 .DEFAULT_GOAL := help
-.PHONY: develop-py develop-js develop-rust develop build-js build-py build-rust build lint-py lint-js lint-rust lint fix-py fix-js fix-rust fix checks-py checks-js checks-rust checks tests-py tests-js tests-rust tests test tests-ci help
+.PHONY: develop-py develop-js develop-rust develop build-js build-py build-rust build lint-py lint-js lint-rust lint fix-py fix-js fix-rust fix checks-py checks-js checks-rust checks tests-py tests-js tests-rust tests test coverage-py coverage-rust coverage help
 
 develop-py:
 	make -C python develop
@@ -68,10 +68,13 @@ tests-rust:
 tests: tests-rust tests-js tests-py  ## Run the tests
 test: tests
 
-tests-ci-rust:
-	make -C rust tests-ci
+coverage-py:
+	make -C python coverage
 
-tests-ci: tests-ci-rust tests-py tests-js
+coverage-rust:
+	make -C rust coverage
+
+coverage: coverage-rust coverage-py tests-js
 
 # Thanks to Francoise at marmelab.com for this
 help:

python/Makefile

@@ -32,10 +32,14 @@ fix:  ## run autofixers
 format: fix
 
 tests:  ## run tests
-	python -m pytest -v transports/tests --junitxml=junit.xml --cov=transports --cov-branch --cov-fail-under=65 --cov-report term-missing --cov-report xml
+	python -m pytest -v transports/tests --junitxml=junit.xml
 
 test: tests
 
+coverage:  ## run tests with coverage
+	python -m pytest -v transports/tests --junitxml=junit.xml --cov=transports --cov-branch --cov-fail-under=65 --cov-report term-missing --cov-report xml
+
+
 checks:  ## run checks
 	# python -m check_manifest
 

rust/Makefile

@@ -1,14 +1,13 @@
 .DEFAULT_GOAL := help
-.PHONY: dev build lint fix check tests tests-ci develop test format checks help
+.PHONY: dev build lint fix check tests coverage develop test format checks help
 
 dev:  ## Install required dev dependencies
 	rustup component add rustfmt
 	rustup component add clippy
-	cargo install cargo2junit
-	cargo install grcov
+	cargo install cargo-nextest 
+	cargo install cargo-llvm-cov
 	cargo install -f wasm-bindgen-cli
 	rustup target add wasm32-unknown-unknown
-	rustup component add llvm-tools-preview
 
 build:  ## Build release
 	cargo build --release --all-features
@@ -24,19 +23,10 @@ check:
 	cargo check --all-features
 
 tests:  ## Run the tests
-	cargo test -- --show-output
-	# cargo test -- -Z unstable-options --format json | cargo2junit > junit.xml
-
-tests-ci: $(eval SHELL:=/bin/bash)
-	{ \
-		export CARGO_INCREMENTAL=0;\
-		export RUSTDOCFLAGS="-Cpanic=abort";\
-		export RUSTFLAGS="-Zprofile -Ccodegen-units=1 -Copt-level=0 -Clink-dead-code -Coverflow-checks=off -Zpanic_abort_tests -Cpanic=abort";\
-		cargo test -- -Z unstable-options --format json | cargo2junit > junit.xml;\
-		grcov . --llvm -s . -t cobertura --branch --ignore-not-existing -o ./coverage.xml;\
-	}
-
+	cargo llvm-cov nextest --cobertura --output-path junit.xml
 
+coverage:
+	cargo llvm-cov nextest --lcov --output-path coverage
 
 # aliases
 develop: dev

rust/src/lib.rs

@@ -1 +1,8 @@
 // pub use transports_core::*;
+#[cfg(test)]
+mod tests {
+    #[test]
+    fn test_test() {
+        assert_eq!(1, 1);
+    }
+}