From 10c1ad5170dff1dc4def9780ff73c3b35fb39402 Mon Sep 17 00:00:00 2001 From: oxalica Date: Thu, 11 Sep 2025 18:46:25 -0400 Subject: [PATCH] build,ci: specify MSRV and setup CI --- .github/workflows/ci.yaml | 8 ++++---- Cargo.toml | 5 +++++ blah-types/Cargo.toml | 3 ++- blahctl/Cargo.toml | 3 ++- blahd/Cargo.toml | 3 ++- rust-toolchain.toml | 4 ---- 6 files changed, 15 insertions(+), 11 deletions(-) delete mode 100644 rust-toolchain.toml diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 835fb30..4473d12 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -47,7 +47,8 @@ jobs: strategy: fail-fast: false matrix: - rust: [stable, beta] + # NB: Sync MSRV with Cargo.toml! + rust: [stable, beta, "1.88"] name: Test ${{ matrix.rust }} # Need libsqlite3-dev >= 3.38.0 (2022-02-22) runs-on: ubuntu-24.04 @@ -64,7 +65,7 @@ jobs: - name: Install Rust ${{ matrix.rust }} run: | - rustup update --no-self-update ${{ matrix.rust }} + rustup update --no-self-update rustup default ${{ matrix.rust }} - name: Disable webapi tests on stable rustc @@ -80,9 +81,8 @@ jobs: - name: Test run: cargo test --workspace --all-targets - # WAIT: Next release of `criterion` for `--include-ignored`. - name: Test ignored - run: cargo test --workspace --all-targets -- --ignored + run: cargo test --workspace --all-targets -- --ignored-ignored nix-flake: name: Flake package diff --git a/Cargo.toml b/Cargo.toml index 446d211..540d710 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -7,6 +7,11 @@ members = [ ] default-members = ["blahd"] +[workspace.package] +edition = "2024" +# NB: Sync MSRV with CI! +rust-version = "1.88" # let_chains + [workspace.lints.clippy] allow_attributes_without_reason = "warn" dbg_macro = "warn" diff --git a/blah-types/Cargo.toml b/blah-types/Cargo.toml index 06c521d..8ebb4ed 100644 --- a/blah-types/Cargo.toml +++ b/blah-types/Cargo.toml @@ -1,7 +1,8 @@ [package] name = "blah-types" version = "0.0.0" -edition = "2024" +edition.workspace = true +rust-version.workspace = true [features] default = ["ed25519-dalek/default"] diff --git a/blahctl/Cargo.toml b/blahctl/Cargo.toml index c45d363..3544dc4 100644 --- a/blahctl/Cargo.toml +++ b/blahctl/Cargo.toml @@ -1,7 +1,8 @@ [package] name = "blahctl" version = "0.1.0" -edition = "2024" +edition.workspace = true +rust-version.workspace = true [dependencies] anyhow = "1" diff --git a/blahd/Cargo.toml b/blahd/Cargo.toml index c40daa8..6b1daa1 100644 --- a/blahd/Cargo.toml +++ b/blahd/Cargo.toml @@ -1,7 +1,8 @@ [package] name = "blahd" version = "0.0.0" -edition = "2024" +edition.workspace = true +rust-version.workspace = true [features] default = [] diff --git a/rust-toolchain.toml b/rust-toolchain.toml deleted file mode 100644 index d94992c..0000000 --- a/rust-toolchain.toml +++ /dev/null @@ -1,4 +0,0 @@ -[toolchain] -channel = "1.85" -profile = "default" -components = ["llvm-tools"]