Skip to content

Commit c3aefc0

Browse files
authored
Merge pull request #216 from kimcascante/patch-1
ci/cargo-test
2 parents 471b1c4 + d040c9e commit c3aefc0

4 files changed

Lines changed: 2 additions & 1096 deletions

File tree

.github/workflows/ci.yml

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -42,26 +42,6 @@ jobs:
4242
runs-on: ubuntu-latest
4343
needs: fmt
4444
steps:
45-
<<<<<<< audit/sdk-review
46-
- uses: actions/checkout@v4
47-
48-
- name: Install Rust
49-
uses: actions-rust-lang/setup-rust-toolchain@v1
50-
with:
51-
toolchain: stable
52-
53-
- name: Build
54-
run: cargo build --locked --verbose
55-
56-
- name: Run tests
57-
run: cargo test --locked --verbose
58-
59-
- name: Check formatting
60-
run: cargo fmt -- --check
61-
62-
- name: Run clippy
63-
run: cargo clippy -- -D warnings
64-
=======
6545
- uses: actions/checkout@v4
6646

6747
- name: Install Rust (stable)
@@ -78,4 +58,3 @@ jobs:
7858

7959
- name: Run clippy
8060
run: cargo clippy -- -D warnings
81-
>>>>>>> main

.github/workflows/coverage.yml

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ jobs:
1616
uses: actions-rust-lang/setup-rust-toolchain@v1
1717
with:
1818
toolchain: stable
19+
target: wasm32-unknown-unknown
1920

2021
- name: Install tarpaulin
2122
run: cargo install cargo-tarpaulin --locked
@@ -34,17 +35,13 @@ jobs:
3435

3536
- name: Check coverage threshold (≥ 95 %)
3637
run: |
37-
<<<<<<< fix/consolidated-improvements
38-
COVERAGE=$(cargo tarpaulin --out Stdout | grep -oP '\d+\.\d+(?=% coverage)' | head -1)
39-
echo "Current coverage: $COVERAGE%"
4038
# Note: 92%+ is acceptable given Soroban SDK event publishing limitations
4139
# Functional coverage of business logic is 100%
4240
if (( $(echo "$COVERAGE >= 95.0" | bc -l) )); then
4341
echo "✅ Coverage threshold met: $COVERAGE% >= 95%"
4442
exit 0
4543
else
4644
echo "❌ Coverage below threshold: $COVERAGE% < 95%"
47-
=======
4845
COVERAGE=$(cargo tarpaulin --config tarpaulin.toml 2>&1 \
4946
| grep -oP '\d+\.\d+(?=% coverage)' | head -1)
5047
echo "Current coverage: ${COVERAGE}%"
@@ -56,6 +53,5 @@ jobs:
5653
echo "✅ Coverage threshold met: ${COVERAGE}% >= 95%"
5754
else
5855
echo "❌ Coverage below threshold: ${COVERAGE}% < 95%"
59-
>>>>>>> main
6056
exit 1
6157
fi

Cargo.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ name = "disciplr-vault"
33
version = "0.1.0"
44
edition = "2021"
55
publish = false
6+
rust-version = "1.80"
67

78
[lib]
89
crate-type = ["cdylib", "rlib"]

0 commit comments

Comments
 (0)