Use ODB from package repository for Ubuntu 24.04

Author: mcserep

.github/scripts/ubuntu-24.04/compile_build.sh

@@ -17,29 +17,4 @@ cd thrift-0.16.0
   --without-dotnetcore --without-d --without-qt4 --without-qt5      \
   --without-java --without-swift
 
-make install -j $(nproc)
-
-## Compile build2
-
-sh "${DOWNLOAD_PATH}/install_latest_build2.sh" ${INSTALL_PATH}/build2
-
-## Compile odb, libodb, and its connectors
-
-mkdir -p ${DOWNLOAD_PATH}/odb
-cd ${DOWNLOAD_PATH}/odb
-${INSTALL_PATH}/build2/bin/bpkg create --quiet --jobs $(nproc) cc \
-  config.cxx=g++ \
-  config.cc.coptions=-O3 \
-  config.bin.rpath=${INSTALL_PATH}/odb/lib \
-  config.install.root=${INSTALL_PATH}/odb
-
-### Getting the source
-${INSTALL_PATH}/build2/bin/bpkg add https://pkg.cppget.org/1/beta --trust-yes
-${INSTALL_PATH}/build2/bin/bpkg fetch --trust-yes
-
-### Building odb
-${INSTALL_PATH}/build2/bin/bpkg build odb --yes
-${INSTALL_PATH}/build2/bin/bpkg build libodb --yes
-${INSTALL_PATH}/build2/bin/bpkg build libodb-sqlite --yes
-${INSTALL_PATH}/build2/bin/bpkg build libodb-pgsql --yes
-${INSTALL_PATH}/build2/bin/bpkg install --all --recursive
+make install -j $(nproc)

.github/scripts/ubuntu-24.04/download_build.sh

@@ -8,13 +8,6 @@ mkdir -p "${DOWNLOAD_PATH}"
 
 wget -O ${DOWNLOAD_PATH}/thrift-0.16.0.tar.gz "http://archive.apache.org/dist/thrift/0.16.0/thrift-0.16.0.tar.gz"
 
-## ODB
-
-wget -O "${DOWNLOAD_PATH}/install_latest_build2.sh" "https://github.com/Ericsson/CodeCompass/raw/master/scripts/install_latest_build2.sh"
-build2_version=$(sh "${DOWNLOAD_PATH}/install_latest_build2.sh" --version)
-odb_signature=$(wget -qO- https://pkg.cppget.org/1/beta/signature.manifest)
-odb_hash=$(echo -n "${build2_version}${odb_signature}" | md5sum | awk '{print $1}')
-
 # Calculate hash of dependencies for Github Cache Action
 
 dependencies_to_hash=("thrift-0.16.0.tar.gz")
@@ -24,7 +17,6 @@ for file in "${dependencies_to_hash[@]}"; do
     file_hash=$(md5sum "${DOWNLOAD_PATH}/${file}" | awk '{print $1}')
     concatenated_hashes="${concatenated_hashes}${file_hash}"
 done
-concatenated_hashes="${concatenated_hashes}${odb_hash}"
 
 hash_value=$(echo -n "${concatenated_hashes}" | md5sum | awk '{print $1}')
 

.github/scripts/ubuntu-24.04/postcompile_build.sh

@@ -5,11 +5,6 @@
 echo "${INSTALL_PATH}/thrift/bin" >> $GITHUB_PATH
 echo "CMAKE_PREFIX_PATH=${INSTALL_PATH}/thrift:$CMAKE_PREFIX_PATH" >> $GITHUB_ENV
 
-echo "${INSTALL_PATH}/odb/bin" >> $GITHUB_PATH
-echo "CMAKE_PREFIX_PATH=${INSTALL_PATH}/odb:$CMAKE_PREFIX_PATH" >> $GITHUB_ENV
-
 # Clean up dependency sources and intermediate binaries to save space
 rm -f ${DOWNLOAD_PATH}/thrift-0.16.0.tar.gz
-rm -rf ${DOWNLOAD_PATH}/thrift-0.16.0/
-
-rm -rf ${DOWNLOAD_PATH}/odb
+rm -rf ${DOWNLOAD_PATH}/thrift-0.16.0/

.github/scripts/ubuntu-24.04/setup_build.sh

@@ -3,5 +3,6 @@
 # Install required packages for CodeCompass build
 sudo apt install git cmake make g++ libboost-all-dev \
   llvm-15-dev clang-15 libclang-15-dev \
+  odb libodb-dev \
   default-jdk libssl-dev libgraphviz-dev libmagic-dev libgit2-dev exuberant-ctags doxygen \
   libldap2-dev libgtest-dev

.github/scripts/ubuntu-24.04/setup_postgresql.sh

@@ -1,4 +1,4 @@
 #!/bin/bash
 
 # Install PostgreSQL
-sudo apt-get install postgresql-server-dev-16
+sudo apt-get install libodb-pgsql-dev postgresql-server-dev-16

.github/scripts/ubuntu-24.04/setup_sqlite3.sh

@@ -1,4 +1,4 @@
 #!/bin/bash
 
 # Install SQLite3
-sudo apt-get install libsqlite3-dev
+sudo apt-get install libodb-sqlite-dev libsqlite3-dev