Skip to content

Commit 7f6fd2d

Browse files
ocelaiwomisonijnik
authored andcommitted
[fix] fix bitwuzla build version fix
1 parent c7dd2ee commit 7f6fd2d

5 files changed

Lines changed: 4 additions & 13 deletions

File tree

.github/workflows/build.yaml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,7 @@ env:
2929
USE_LIBCXX: 1
3030
Z3_VERSION: 4.8.15
3131
SQLITE_VERSION: 3400100
32-
BITWUZLA_VERSION: main
33-
BITWUZLA_COMMIT: 80ef7cd803e1c71b5939c3eb951f1736388f7090
32+
BITWUZLA_VERSION: 0.3.1
3433
JSON_VERSION: v3.11.3
3534

3635
jobs:

build.sh

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,6 @@ Z3_VERSION=4.8.15
5353
STP_VERSION=2.3.3
5454
MINISAT_VERSION=master
5555

56-
BITWUZLA_VERSION=main
57-
BITWUZLA_COMMIT=80ef7cd803e1c71b5939c3eb951f1736388f7090
56+
BITWUZLA_VERSION=0.3.1
5857

59-
BASE="$BASE" KLEE_RUNTIME_BUILD=$KLEE_RUNTIME_BUILD COVERAGE=$COVERAGE ENABLE_DOXYGEN=$ENABLE_DOXYGEN USE_TCMALLOC=$USE_TCMALLOC USE_LIBCXX=$USE_LIBCXX LLVM_VERSION=$LLVM_VERSION ENABLE_OPTIMIZED=$ENABLE_OPTIMIZED ENABLE_DEBUG=$ENABLE_DEBUG DISABLE_ASSERTIONS=$DISABLE_ASSERTIONS REQUIRES_RTTI=$REQUIRES_RTTI SOLVERS=$SOLVERS GTEST_VERSION=$GTEST_VERSION UCLIBC_VERSION=$UCLIBC_VERSION STP_VERSION=$STP_VERSION MINISAT_VERSION=$MINISAT_VERSION Z3_VERSION=$Z3_VERSION BITWUZLA_VERSION=$BITWUZLA_VERSION BITWUZLA_COMMIT=$BITWUZLA_COMMIT SQLITE_VERSION=$SQLITE_VERSION JSON_VERSION=$JSON_VERSION ./scripts/build/build.sh klee --install-system-deps
58+
BASE="$BASE" KLEE_RUNTIME_BUILD=$KLEE_RUNTIME_BUILD COVERAGE=$COVERAGE ENABLE_DOXYGEN=$ENABLE_DOXYGEN USE_TCMALLOC=$USE_TCMALLOC USE_LIBCXX=$USE_LIBCXX LLVM_VERSION=$LLVM_VERSION ENABLE_OPTIMIZED=$ENABLE_OPTIMIZED ENABLE_DEBUG=$ENABLE_DEBUG DISABLE_ASSERTIONS=$DISABLE_ASSERTIONS REQUIRES_RTTI=$REQUIRES_RTTI SOLVERS=$SOLVERS GTEST_VERSION=$GTEST_VERSION UCLIBC_VERSION=$UCLIBC_VERSION STP_VERSION=$STP_VERSION MINISAT_VERSION=$MINISAT_VERSION Z3_VERSION=$Z3_VERSION BITWUZLA_VERSION=$BITWUZLA_VERSION SQLITE_VERSION=$SQLITE_VERSION JSON_VERSION=$JSON_VERSION ./scripts/build/build.sh klee --install-system-deps

scripts/build/common-functions

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,6 @@ function git_clone_or_update() {
1515
fi
1616
popd
1717
fi
18-
19-
if [[ $# -ge 4 ]]; then
20-
pushd "$destination"
21-
git checkout $4
22-
popd
23-
fi
2418
}
2519

2620
function get_git_hash() {

scripts/build/p-bitwuzla.inc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ setup_build_variables_bitwuzla() {
1313
download_bitwuzla() {
1414
source "${DIR}/common-functions"
1515
# Download Bitwuzla
16-
git_clone_or_update "${bitwuzla_url}" "${BASE}/bitwuzla-${BITWUZLA_VERSION}" "${BITWUZLA_VERSION}" "${BITWUZLA_COMMIT}"
16+
git_clone_or_update "${bitwuzla_url}" "${BASE}/bitwuzla-${BITWUZLA_VERSION}" "${BITWUZLA_VERSION}"
1717
}
1818

1919
build_bitwuzla() {

scripts/build/v-bitwuzla.inc

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
# Build information for Bitwuzla solver
22
required_variables_bitwuzla=(
33
"BITWUZLA_VERSION"
4-
"BITWUZLA_COMMIT"
54
)
65

76
artifact_dependency_bitwuzla=("sanitizer")

0 commit comments

Comments
 (0)