Skip to content

Commit fb1925f

Browse files
committed
CI: Use CaDiCaL on Windows
We should also build solvers others than MiniSat on Windows.
1 parent dae5af0 commit fb1925f

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

.github/workflows/pull-request-checks.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -730,7 +730,7 @@ jobs:
730730
echo "CLCACHE_BASEDIR=$((Get-Item -Path '.\').FullName)" >> $env:GITHUB_ENV
731731
echo "CLCACHE_DIR=$pwd\.ccache" >> $env:GITHUB_ENV
732732
- name: Configure with cmake
733-
run: cmake -S . -B build
733+
run: cmake -S . -B build -Dsat_impl="minisat2;cadical"
734734
- name: Zero ccache stats and limit in size (2 GB)
735735
run: |
736736
clcache -z
@@ -858,7 +858,7 @@ jobs:
858858
echo "CLCACHE_BASEDIR=$((Get-Item -Path '.\').FullName)" >> $env:GITHUB_ENV
859859
echo "CLCACHE_DIR=$pwd\.ccache" >> $env:GITHUB_ENV
860860
- name: Configure with cmake
861-
run: cmake -S . -B build
861+
run: cmake -S . -B build -Dsat_impl="minisat2;cadical"
862862
- name: Build Release
863863
run: cmake --build build --config Release -- /p:UseMultiToolTask=true /p:CLToolExe=clcache
864864
- name: Print ccache stats

src/solvers/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ foreach(SOLVER ${sat_impl})
124124
URL https://github.com/arminbiere/cadical/archive/rel-2.0.0.tar.gz
125125
PATCH_COMMAND patch -p1 -i ${CBMC_SOURCE_DIR}/../scripts/cadical-2.0.0-patch
126126
COMMAND cmake -E copy ${CBMC_SOURCE_DIR}/../scripts/cadical_CMakeLists.txt CMakeLists.txt
127-
COMMAND ./configure
127+
COMMAND ${CMAKE_BINARY_DIR}/cadical-src/configure
128128
URL_MD5 9fc2a66196b86adceb822a583318cc35
129129
)
130130

@@ -146,7 +146,7 @@ foreach(SOLVER ${sat_impl})
146146
download_project(PROJ cadical
147147
URL https://github.com/arminbiere/cadical/archive/rel-2.0.0.tar.gz
148148
PATCH_COMMAND patch -p1 -i ${CBMC_SOURCE_DIR}/../scripts/cadical-2.0.0-patch
149-
COMMAND ./configure
149+
COMMAND ${CMAKE_BINARY_DIR}/cadical-src/configure
150150
URL_MD5 9fc2a66196b86adceb822a583318cc35
151151
)
152152

0 commit comments

Comments
 (0)