Skip to content

Commit cb68b41

Browse files
author
Alex
committed
Merge remote-tracking branch 'gitea/main'
2 parents c326e0c + ff785a8 commit cb68b41

3 files changed

Lines changed: 28 additions & 6 deletions

File tree

.config/nextest.toml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
[profile.default]
2+
fail-fast = false
3+
slow-timeout = { period = "60s", terminate-after = 3 }
4+
5+
[profile.ci]
6+
test-threads = 4

.github/workflows/ci-main.yml

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -224,13 +224,21 @@ jobs:
224224
BINARY_SIZE=$(stat -f%z target/${{ matrix.target }}/release/terraphim_server 2>/dev/null || stat -c%s target/${{ matrix.target }}/release/terraphim_server)
225225
echo "Server binary size: $BINARY_SIZE bytes"
226226
227+
- name: Install cargo-nextest
228+
run: |
229+
if ! command -v cargo-nextest >/dev/null 2>&1; then
230+
cargo install cargo-nextest --locked
231+
fi
232+
cargo nextest --version
233+
227234
- name: Run tests
228235
run: |
229-
# Run unit and integration tests (exclude integration-signing which requires zitsign CLI)
236+
# Run unit and integration tests via nextest (exclude integration-signing which requires zitsign CLI)
230237
# zlob feature required: fff-search build.rs panics when CI=true without zlob.
231238
# terraphim_automata/medical required: SHA-256 checksum verification tests for the
232239
# deserialize_unchecked safety precondition (security finding #1313 P1-1).
233-
/home/alex/.local/bin/rch exec -- cargo test --release --target ${{ matrix.target }} --workspace --no-fail-fast --features "self_update/signatures,zlob,terraphim_automata/medical"
240+
# slow-timeout and fail-fast are configured in .config/nextest.toml [profile.ci]
241+
/home/alex/.local/bin/rch exec -- cargo nextest run --release --target ${{ matrix.target }} --workspace --profile ci --features "self_update/signatures,zlob,terraphim_automata/medical"
234242
235243
- name: sccache stats
236244
if: always()

.github/workflows/ci-pr.yml

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -293,8 +293,8 @@ jobs:
293293
name: Rust Unit Tests
294294
runs-on: [self-hosted, bigbox]
295295
timeout-minutes: 8
296-
needs: [changes, rust-compile]
297-
if: needs.changes.outputs.rust-changed == 'true' && needs.rust-compile.result == 'success'
296+
needs: [changes, rust-format]
297+
if: needs.changes.outputs.rust-changed == 'true' && needs.rust-format.result == 'success'
298298
env:
299299
RUSTC_WRAPPER: /home/alex/.local/bin/sccache
300300
SCCACHE_BUCKET: rust-cache
@@ -357,10 +357,18 @@ jobs:
357357
${{ runner.os }}-cargo-pr-
358358
${{ runner.os }}-cargo-
359359
360+
- name: Install cargo-nextest
361+
run: |
362+
if ! command -v cargo-nextest >/dev/null 2>&1; then
363+
cargo install cargo-nextest --locked
364+
fi
365+
cargo nextest --version
366+
360367
- name: Run unit tests
361368
run: |
362-
# Run unit tests (rocksdb feature disabled in CI, zlob enabled for fff-search)
363-
/home/alex/.local/bin/rch exec -- cargo test --workspace --no-fail-fast --lib --bins --features zlob -- --test-threads=2
369+
# Run unit tests via nextest (rocksdb feature disabled in CI, zlob enabled for fff-search)
370+
# slow-timeout and fail-fast are configured in .config/nextest.toml [profile.ci]
371+
/home/alex/.local/bin/rch exec -- cargo nextest run --workspace --profile ci --lib --bins --features zlob
364372
365373
- name: sccache stats
366374
if: always()

0 commit comments

Comments
 (0)