From bbff8b89a89e2175f4983b393696fa26ba520aa9 Mon Sep 17 00:00:00 2001
From: Leonid Fedorov <leonid.fedorov@mariadb.com>
Date: Wed, 16 Jul 2025 13:02:22 +0000
Subject: [PATCH] colored coredumps

---
 .drone.jsonnet                 | 5 -----
 build/createrepo.sh            | 2 +-
 core_dumps/core_dump_format.sh | 4 ++--
 3 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/.drone.jsonnet b/.drone.jsonnet
index b91c42dde..479d4315a 100644
--- a/.drone.jsonnet
+++ b/.drone.jsonnet
@@ -45,16 +45,11 @@ local customBootstrapParamsForExisitingPipelines(envkey) =
 
 local customBootstrapParamsForAdditionalPipelinesMap = {
   ASan: "--asan",
-<<<<<<< HEAD
   TSAN: "--tsan",
   UBSan: "--ubsan",
   MSan: "--msan",
   "libcpp": "--libcpp",
   "gcc-toolset": "--gcc-toolset-for-rocky-8"
-=======
-  //TSAN: "--tsan",
-  UBSan: "--ubsan",
->>>>>>> a25d751cb (Add flag key prefix to $result)
 };
 
 local customBuildFlags(buildKey) =
diff --git a/build/createrepo.sh b/build/createrepo.sh
index 5911f1fa3..03c1b89c1 100755
--- a/build/createrepo.sh
+++ b/build/createrepo.sh
@@ -46,7 +46,7 @@ if [[ $(compgen -G "$COLUMNSTORE_RPM_PACKAGES_PATH") ]]; then
   mv -v $COLUMNSTORE_RPM_PACKAGES_PATH "./${RESULT}/"
 elif [[ $(compgen -G "$COLUMNSTORE_DEB_PACKAGES_PATH") ]]; then
   mv -v $COLUMNSTORE_DEB_PACKAGES_PATH "./${RESULT}/"
-  mv -v $COLUMNSTORE_DEBUG_DEB_PACKAGES_PATH "./${RESULT}/"
+  mv -v $COLUMNSTORE_DEBUG_DEB_PACKAGES_PATH "./${RESULT}/" || true
 else
   echo "Columnstore packages are not found!"
 fi
diff --git a/core_dumps/core_dump_format.sh b/core_dumps/core_dump_format.sh
index 0e9e0ee1f..2e5e63a46 100755
--- a/core_dumps/core_dump_format.sh
+++ b/core_dumps/core_dump_format.sh
@@ -12,10 +12,10 @@ STEP_NAME=$5
 save_ansi_to_html() {
 
 	echo "<h2> $1 </h2>" >>"${FILENAME}"
-	cat "$DUMPNAME" | bash "${SCRIPT_LOCATION}"/ansi2html.sh --palette=solarized >>"${FILENAME}"
+	cat "$DUMPNAME" | bash "${SCRIPT_LOCATION}"/ansi2html.sh --bg=dark --palette=tango >>"${FILENAME}"
 }
 invoke_gdb_command() {
-    gdb -x "${SCRIPT_LOCATION}"/gdbinit -q ${BINARY} --core ${COREDUMP} -ex "$1" -ex quit >>"$DUMPNAME"
+	script -q -c "gdb -x \"${SCRIPT_LOCATION}\"/gdbinit -q ${BINARY} --core ${COREDUMP} -ex \"$1\" -ex \"quit\"" $DUMPNAME
 }
 
 echo "<h1> Step: ${STEP_NAME}<br> Binary name: ${BINARY}<br> </h1>" >>"${FILENAME}"