From 2463c746fd445de68228aa1c70e07d2d6800e126 Mon Sep 17 00:00:00 2001 From: "Jip J. Dekker" Date: Tue, 25 Jun 2024 10:22:31 +1000 Subject: [PATCH] Update CaDiCaL to work on Windows --- .github/workflows/rust.yml | 46 ++++++++------------------------------ 1 file changed, 9 insertions(+), 37 deletions(-) diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index 95b8ede9b9..f605c95b89 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -13,28 +13,11 @@ env: RUST_FMT_CHANNEL: nightly jobs: - # build: - # runs-on: ubuntu-latest - # strategy: - # matrix: - # crate: [] - # steps: - # - uses: actions/checkout@v3 - # - name: Install Rust toolchain - # run: | - # rustup toolchain install --profile minimal --no-self-update ${{ env.RUST_CHANNEL }} - # rustup default ${{ env.RUST_CHANNEL }} - # - name: Cache dependencies - # uses: Swatinem/rust-cache@v2 - # - name: Build ${{ matrix.crate }} - # run: cargo install --root dist/ --path crates/${{ matrix.crate }} - # - name: Upload build artifact - # uses: actions/upload-artifact@v3 - # with: - # name: ${{ matrix.crate }}-${{ matrix.os }} - # path: dist/ test: - runs-on: ubuntu-latest + runs-on: ${{ matrix.os }} + strategy: + matrix: + os: [ubuntu-latest, windows-latest] steps: - uses: actions/checkout@v4 with: @@ -43,10 +26,10 @@ jobs: run: | rustup toolchain install --profile minimal --no-self-update ${{ env.RUST_CHANNEL }} rustup default ${{ env.RUST_CHANNEL }} - - name: Cache dependencies - uses: Swatinem/rust-cache@v2 + - name: Run sccache-cache + uses: mozilla-actions/sccache-action@v0.0.5 - name: Run cargo test - run: cargo test --all-features + run: cargo test --features splr,cadical,kissat,intel-sat,ipasir-up clippy: runs-on: ubuntu-latest steps: @@ -57,8 +40,8 @@ jobs: run: | rustup toolchain install --profile minimal --component clippy --no-self-update ${{ env.RUST_CHANNEL }} rustup default ${{ env.RUST_CHANNEL }} - - name: Cache dependencies - uses: Swatinem/rust-cache@v2 + - name: Run sccache-cache + uses: mozilla-actions/sccache-action@v0.0.5 - name: Run clippy run: cargo clippy --tests --features splr,cadical,kissat,intel-sat,ipasir-up -- -D warnings format: @@ -73,14 +56,3 @@ jobs: rustup default ${{ env.RUST_CHANNEL }} - name: Run cargo format run: cargo +nightly fmt --all --check - # TODO: Re-enable after first release - # semver: - # runs-on: ubuntu-latest - # steps: - # - uses: actions/checkout@v4 - # with: - # submodules: true - # - name: Check semver - # uses: obi1kenobi/cargo-semver-checks-action@v2 - # with: - # crate-name: pindakaas