From fcfa9dffed93f914dfa92181fe672c0c5a1e479f Mon Sep 17 00:00:00 2001 From: Noah Bruns Date: Mon, 1 Jul 2024 17:32:42 +0200 Subject: [PATCH] PR: implemented suggestions and applied reviews --- .github/workflows/batsat.yml | 8 ++------ .github/workflows/docs.yml | 2 +- .github/workflows/semver-checks.yml | 4 ++++ Cargo.toml | 1 - batsat/CHANGELOG.md | 6 ++---- batsat/Cargo.toml | 3 --- batsat/src/lib.rs | 11 +++++++++-- release-plz.toml | 5 +++++ 8 files changed, 23 insertions(+), 17 deletions(-) diff --git a/.github/workflows/batsat.yml b/.github/workflows/batsat.yml index 8eb0e5dd..cd5ef4df 100644 --- a/.github/workflows/batsat.yml +++ b/.github/workflows/batsat.yml @@ -2,9 +2,9 @@ name: BatSat on: push: - branches: [ "main" ] + branches: [ "main", "next-major" ] pull_request: - branches: [ "main" ] + branches: [ "main", "next-major" ] env: CARGO_TERM_COLOR: always @@ -26,9 +26,5 @@ jobs: shared-key: "build-test" - name: Cargo build run: cargo build -p rustsat-batsat --verbose - env: - CMAKE_BUILD_PARALLEL_LEVEL: ${{ fromJSON('["", "4"]')[matrix.os == 'macos-latest'] }} - name: Cargo test run: cargo test -p rustsat-batsat --verbose - env: - CMAKE_BUILD_PARALLEL_LEVEL: ${{ fromJSON('["", "4"]')[matrix.os == 'macos-latest'] }} diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index 82831b8e..9a954b6c 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -32,7 +32,7 @@ jobs: echo "failed for main crate" return=false fi - for dir in tools cadical kissat minisat glucose ipasir capi pyapi; do + for dir in tools cadical kissat minisat glucose batsat ipasir capi pyapi; do cd ${dir} if ! cargo rdme --check; then echo "failed for ${dir}" diff --git a/.github/workflows/semver-checks.yml b/.github/workflows/semver-checks.yml index d756f6eb..3b073590 100644 --- a/.github/workflows/semver-checks.yml +++ b/.github/workflows/semver-checks.yml @@ -43,3 +43,7 @@ jobs: uses: obi1kenobi/cargo-semver-checks-action@v2 with: package: rustsat-ipasir + - name: BatSat + uses: obi1kenobi/cargo-semver-checks-action@v2 + with: + package: rustsat-batsat \ No newline at end of file diff --git a/Cargo.toml b/Cargo.toml index 1c97d27d..386f0b2d 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -6,7 +6,6 @@ members = [ "glucose", "minisat", "ipasir", - "batsat", "solvertests", "capi", "pyapi", diff --git a/batsat/CHANGELOG.md b/batsat/CHANGELOG.md index ef16d198..c582dab2 100644 --- a/batsat/CHANGELOG.md +++ b/batsat/CHANGELOG.md @@ -2,10 +2,8 @@ All notable changes to this project will be documented in this file. -## [0.2.4] - 2024-04-10 +## [0.1.0] - -### 🚀 Features - -- Implemented batsat api +Initial Release diff --git a/batsat/Cargo.toml b/batsat/Cargo.toml index aa0a33a0..d23d95bb 100644 --- a/batsat/Cargo.toml +++ b/batsat/Cargo.toml @@ -11,9 +11,6 @@ readme = "README.md" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html -[features] -debug = [] - [dependencies] batsat = "0.5.0" # when changing this version, do not forget to update signature anyhow.workspace = true diff --git a/batsat/src/lib.rs b/batsat/src/lib.rs index 2e9d74de..462acfc4 100644 --- a/batsat/src/lib.rs +++ b/batsat/src/lib.rs @@ -1,6 +1,13 @@ -//! # BatSat Solver Interface +//! # rustsat-batsat - Interface to the BatSat SAT Solver for RustSAT //! -//! Interface to the [BatSat](https://github.com/c-cube/batsat) incremental SAT-Solver +//! Interface to the [BatSat](https://github.com/c-cube/batsat) incremental SAT-Solver to be used with the [RustSAT](https://github.com/chrjabs/rustsat) library. +//! +//! # BatSat Version +//! +//! The version of BatSat in this crate is Version 0.5.0. + +#![warn(clippy::pedantic)] +#![warn(missing_docs)] use batsat::{intmap::AsIndex, lbool, BasicSolver, SolverInterface}; use rustsat::{ diff --git a/release-plz.toml b/release-plz.toml index fe2e31a4..28ca80fb 100644 --- a/release-plz.toml +++ b/release-plz.toml @@ -40,3 +40,8 @@ git_release_enable = false name = "rustsat-pyapi" release = false git_release_enable = false + +[[package]] +name = "rustsat-batsat" +release = false +git_release_enable = false