From 6431f22c83a790a1afdfa794af60c8c86e8d49b6 Mon Sep 17 00:00:00 2001 From: Adrian Palacios Date: Tue, 2 Jan 2024 15:46:19 -0500 Subject: [PATCH 1/2] Use `cmake` to build CBMC in `regression` jobs --- .github/workflows/cbmc-latest.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/cbmc-latest.yml b/.github/workflows/cbmc-latest.yml index 9cb8082ae4b7..a24110a09666 100644 --- a/.github/workflows/cbmc-latest.yml +++ b/.github/workflows/cbmc-latest.yml @@ -45,8 +45,8 @@ jobs: - name: Build CBMC working-directory: ./cbmc run: | - make -C src minisat2-download cadical-download - make -C src -j4 MINISAT2=../../minisat-2.2.1 CADICAL=../../cadical + cmake -S . -Bbuild -DWITH_JBMC=OFF + cmake --build build -- -j 4 # Prepend the bin directory to $PATH echo "${GITHUB_WORKSPACE}/cbmc/build/bin" >> $GITHUB_PATH From 4444ab783232ef96bcaf26de83a270e52c68adb6 Mon Sep 17 00:00:00 2001 From: Adrian Palacios Date: Tue, 2 Jan 2024 17:08:24 -0500 Subject: [PATCH 2/2] Also build with cadical --- .github/workflows/cbmc-latest.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/cbmc-latest.yml b/.github/workflows/cbmc-latest.yml index a24110a09666..e2a1f7a124f2 100644 --- a/.github/workflows/cbmc-latest.yml +++ b/.github/workflows/cbmc-latest.yml @@ -45,7 +45,7 @@ jobs: - name: Build CBMC working-directory: ./cbmc run: | - cmake -S . -Bbuild -DWITH_JBMC=OFF + cmake -S . -Bbuild -DWITH_JBMC=OFF -Dsat_impl="minisat2;cadical" cmake --build build -- -j 4 # Prepend the bin directory to $PATH echo "${GITHUB_WORKSPACE}/cbmc/build/bin" >> $GITHUB_PATH