From 56e68d45aa0bee1d63e66ecaebf982a1470769ce Mon Sep 17 00:00:00 2001
From: Aleksei Babushkin <ocelaiwo@gmail.com>
Date: Mon, 29 Jan 2024 16:40:15 +0500
Subject: [PATCH] [fix] fix bitwuzla build version fix

---
 .github/workflows/build.yaml   | 3 +--
 build.sh                       | 5 ++---
 scripts/build/common-functions | 6 ------
 scripts/build/p-bitwuzla.inc   | 2 +-
 scripts/build/v-bitwuzla.inc   | 1 -
 5 files changed, 4 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 91e11e7431..2e531d15da 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -29,8 +29,7 @@ env:
   USE_LIBCXX: 1
   Z3_VERSION: 4.8.15
   SQLITE_VERSION: 3400100
-  BITWUZLA_VERSION: main
-  BITWUZLA_COMMIT: 80ef7cd803e1c71b5939c3eb951f1736388f7090
+  BITWUZLA_VERSION: 0.3.1
   JSON_VERSION: v3.11.3
 
 jobs:
diff --git a/build.sh b/build.sh
index 2bd37ea984..6878b06a10 100755
--- a/build.sh
+++ b/build.sh
@@ -53,7 +53,6 @@ Z3_VERSION=4.8.15
 STP_VERSION=2.3.3
 MINISAT_VERSION=master
 
-BITWUZLA_VERSION=main
-BITWUZLA_COMMIT=80ef7cd803e1c71b5939c3eb951f1736388f7090
+BITWUZLA_VERSION=0.3.1
 
-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
+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
diff --git a/scripts/build/common-functions b/scripts/build/common-functions
index 65027f0bd3..d7ae4654c4 100644
--- a/scripts/build/common-functions
+++ b/scripts/build/common-functions
@@ -15,12 +15,6 @@ function git_clone_or_update() {
     fi
     popd
   fi
-
-  if [[ $# -ge 4 ]]; then
-    pushd "$destination"
-    git checkout $4
-    popd
-  fi
 }
 
 function get_git_hash() {
diff --git a/scripts/build/p-bitwuzla.inc b/scripts/build/p-bitwuzla.inc
index 87a28ea827..fb518ab1f8 100644
--- a/scripts/build/p-bitwuzla.inc
+++ b/scripts/build/p-bitwuzla.inc
@@ -13,7 +13,7 @@ setup_build_variables_bitwuzla() {
 download_bitwuzla() {
   source "${DIR}/common-functions"
   # Download Bitwuzla
-  git_clone_or_update "${bitwuzla_url}" "${BASE}/bitwuzla-${BITWUZLA_VERSION}" "${BITWUZLA_VERSION}" "${BITWUZLA_COMMIT}"
+  git_clone_or_update "${bitwuzla_url}" "${BASE}/bitwuzla-${BITWUZLA_VERSION}" "${BITWUZLA_VERSION}"
 }
 
 build_bitwuzla() {
diff --git a/scripts/build/v-bitwuzla.inc b/scripts/build/v-bitwuzla.inc
index bccd375853..752e9e64d8 100644
--- a/scripts/build/v-bitwuzla.inc
+++ b/scripts/build/v-bitwuzla.inc
@@ -1,7 +1,6 @@
 # Build information for Bitwuzla solver
 required_variables_bitwuzla=(
   "BITWUZLA_VERSION"
-  "BITWUZLA_COMMIT"
 )
 
 artifact_dependency_bitwuzla=("sanitizer")