database/mariadb-columnstore-engine
1
0
Fork 0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2025-07-30 19:23:07 +03:00
Code Activity

set only one config dir, as LAYOUT_STANDALONE works with the same one, forcing color

Browse Source 
inside bootstrap
This commit is contained in:
Leonid Fedorov
2025-05-22 16:20:18 +00:00
committed by Leonid Fedorov
parent a359a8f7b8
commit d8a9617312
2 changed files with 3 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.drone.jsonnet
View File

@ -737,7 +737,6 @@ local Pipeline(branch, platform, event, arch="amd64", server="10.6-enterprise",
//SCCACHE_LOG: 'debug', //SCCACHE_LOG: 'debug',
}, },
commands: [ commands: [
"export CLICOLOR_FORCE=1",
"mkdir /mdb/" + builddir + "/" + result, "mkdir /mdb/" + builddir + "/" + result,
get_sccache, get_sccache,
] ]

10
build/bootstrap_mcs.sh
View File

@ -6,13 +6,13 @@
set -o pipefail set -o pipefail
export CLICOLOR_FORCE=1 #cmake output
INSTALL_PREFIX="/usr/" INSTALL_PREFIX="/usr/"
DATA_DIR="/var/lib/mysql/data" DATA_DIR="/var/lib/mysql/data"
CMAKE_BIN_NAME=cmake CMAKE_BIN_NAME=cmake
CTEST_BIN_NAME=ctest CTEST_BIN_NAME=ctest
RPM_CONFIG_DIR="/etc/my.cnf.d" CONFIG_DIR="/etc/my.cnf.d"
DEB_CONFIG_DIR="/etc/mysql/mariadb.conf.d"
CONFIG_DIR=$RPM_CONFIG_DIR
SCRIPT_LOCATION=$(dirname "$0") SCRIPT_LOCATION=$(dirname "$0")
MDB_SOURCE_PATH=$(realpath "$SCRIPT_LOCATION"/../../../..) MDB_SOURCE_PATH=$(realpath "$SCRIPT_LOCATION"/../../../..)
@ -84,10 +84,6 @@ if [[ "$OS" == *"rocky"* ]]; then
pkg_format="rpm" pkg_format="rpm"
fi fi
if [[ $pkg_format = "deb" ]]; then
CONFIG_DIR=$DEB_CONFIG_DIR
fi
disable_git_restore_frozen_revision() { disable_git_restore_frozen_revision() {
cd $MDB_SOURCE_PATH cd $MDB_SOURCE_PATH
git config submodule.storage/columnstore/columnstore.update none git config submodule.storage/columnstore/columnstore.update none