From ee725a6d29eaab61c476f5a8feed8a3041e248e1 Mon Sep 17 00:00:00 2001 From: Christoph Jabs Date: Tue, 9 Jan 2024 10:36:59 +0200 Subject: [PATCH] merge check and test runs and include partial win ci --- .github/workflows/check-test.yml | 41 +++++++++++++++----------------- rustsat/Cargo.toml | 1 - 2 files changed, 19 insertions(+), 23 deletions(-) diff --git a/.github/workflows/check-test.yml b/.github/workflows/check-test.yml index c4901efb..d609285c 100644 --- a/.github/workflows/check-test.yml +++ b/.github/workflows/check-test.yml @@ -10,11 +10,11 @@ env: CARGO_TERM_COLOR: always jobs: - check: - name: Check + check-test: + name: Build and test strategy: matrix: - os: [ubuntu-latest, macos-latest] + os: [ubuntu-latest, macos-latest, windows-latest] runs-on: ${{ matrix.os }} steps: - name: Checkout sources @@ -22,25 +22,22 @@ jobs: - name: Install stable toolchain uses: dtolnay/rust-toolchain@stable - uses: Swatinem/rust-cache@v2 - - name: Run cargo check - run: cargo check --workspace --verbose --features=all - - test: - name: Test suite - strategy: - matrix: - os: [ubuntu-latest, macos-latest] - runs-on: ${{ matrix.os }} - steps: - - name: Checkout sources - uses: actions/checkout@v4 - - name: Install stable toolchain - uses: dtolnay/rust-toolchain@stable - - uses: Swatinem/rust-cache@v2 - - name: Build project - run: cargo build - - name: Run cargo test suite - run: cargo test --workspace --verbose + - name: Cargo build + shell: bash + run: | + if [ "$RUNNER_OS" == "Windows" ]; then + cargo build --workspace --verbose --features=all --exclude rustsat-kissat --exclude rustsat-cadical + else + cargo build --workspace --verbose --features=all + fi + - name: Cargo test + shell: bash + run: | + if [ "$RUNNER_OS" == "Windows" ]; then + cargo test --workspace --verbose --features=all --exclude rustsat-kissat --exclude rustsat-cadical + else + cargo test --workspace --verbose --features=all + fi doc: name: Doc diff --git a/rustsat/Cargo.toml b/rustsat/Cargo.toml index cabcc84b..8e47c883 100644 --- a/rustsat/Cargo.toml +++ b/rustsat/Cargo.toml @@ -52,7 +52,6 @@ all = [ "compression", "rand", "fxhash", - "pyapi" ] [lib]