From dd914569e6af3800add7945f09e053e36f88591e Mon Sep 17 00:00:00 2001 From: jutty Date: Sat, 20 Jun 2026 12:40:01 -0300 Subject: [PATCH] CI: Make MSRV Windows check conditional --- .forgejo/workflows/verify.yaml | 6 ++++-- .justfile | 8 +++++--- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/.forgejo/workflows/verify.yaml b/.forgejo/workflows/verify.yaml index 82244d8..b15fa2f 100644 --- a/.forgejo/workflows/verify.yaml +++ b/.forgejo/workflows/verify.yaml @@ -40,7 +40,7 @@ jobs: useradd -m ci && chown -R ci:ci . git config --global --add safe.directory "$PWD" - - name: Text matching checks + - name: Text matches run: just ci todos-assess version-assess spell - name: Schema lint run: just ci schema-lint @@ -50,10 +50,12 @@ jobs: run: just ci format-assess - name: Lint run: just ci lint-assess + - name: MSRV + run: just ci msrv-assess - name: Cargo check run: just ci check - name: Test run: just ci test - - name: Assess test coverage + - name: Coverage run: just ci cover-assess diff --git a/.justfile b/.justfile index 798e733..a790e94 100644 --- a/.justfile +++ b/.justfile @@ -74,7 +74,7 @@ alias rq := assess-run-watch-quick # Determine the Minimum Supported Rust Version [group: 'develop'] -msrv: +msrv-find: @{{ make_msrv("find", musl_target) }} @{{ make_msrv("find", glibc_target) }} @{{ make_msrv("find", msvc_target) }} @@ -405,7 +405,9 @@ alias va := version-assess msrv-assess: {{ make_msrv("verify", musl_target) }} {{ make_msrv("verify", glibc_target) }} - {{ make_msrv("verify", msvc_target) }} + if rustup toolchain list | grep -q {{ msvc_target }}; then \ + {{ make_msrv("verify", msvc_target) }} \ + fi # Find TODOs [group: 'assess'] @@ -524,7 +526,7 @@ msvc_target := "x86_64-pc-windows-msvc" default_target := musl_target debug_vars := 'DEBUG=${DEBUG:-} DEBUG_FILTER=${DEBUG_FILTER:-} RUST_BACKTRACE=${RUST_BACKTRACE:-} RUSTFLAGS=${RUSTFLAGS:-}' -just_cmd := 'just --timestamp --explain --command-color green' +just_cmd := 'just --timestamp --command-color green' just_cmd_no_ts := 'just --explain --command-color green' watch_cmd := "watchexec -qc -r -e rs,toml,html,css --color always -- " cover_cmd := 'cargo llvm-cov --color always --ignore-filename-regex "main\.rs|log\.rs"'