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

delete server version dependency hack

Browse Source
This commit is contained in:
Leonid Fedorov
2025-05-22 16:40:03 +00:00
committed by Leonid Fedorov
parent f919c00479
commit 45ed833d72
2 changed files with 0 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.drone.jsonnet
View File

@ -746,7 +746,6 @@ local Pipeline(branch, platform, event, arch="amd64", server="10.6-enterprise",
"--build-type RelWithDebInfo " + "--build-type RelWithDebInfo " +
"--distro " + platform + " " + "--distro " + platform + " " +
"--build-packages --sccache " + "--build-packages --sccache " +
"--server-version " + server +
" " + customBootstrapParams + " " + customBootstrapParams +
" " + customBootstrapParamsForExisitingPipelines(platform) + " | " + " " + customBootstrapParamsForExisitingPipelines(platform) + " | " +
"/mdb/" + builddir + "/storage/columnstore/columnstore/build/ansi2txt.sh " + "/mdb/" + builddir + "/storage/columnstore/columnstore/build/ansi2txt.sh " +

5
build/bootstrap_mcs.sh
View File

@ -57,7 +57,6 @@ optparse.define short=O long=static desc="Build all with static libraries" varia
optparse.define short=p long=build-packages desc="Build packages" variable=BUILD_PACKAGES default=false value=true optparse.define short=p long=build-packages desc="Build packages" variable=BUILD_PACKAGES default=false value=true
optparse.define short=P long=report-path desc="Path for storing reports and profiles" variable=REPORT_PATH default="/core" optparse.define short=P long=report-path desc="Path for storing reports and profiles" variable=REPORT_PATH default="/core"
optparse.define short=r long=restart-services variable=RESTART_SERVICES default=true value=false optparse.define short=r long=restart-services variable=RESTART_SERVICES default=true value=false
optparse.define short=R long=server-version desc="MariaDB server version" variable=MARIADB_SERVER_VERSION
optparse.define short=s long=sccache desc="Build with sccache" variable=SCCACHE default=false value=true optparse.define short=s long=sccache desc="Build with sccache" variable=SCCACHE default=false value=true
optparse.define short=S long=skip-columnstore-submodules desc="Skip columnstore submodules initialization" variable=SKIP_SUBMODULES default=false value=true optparse.define short=S long=skip-columnstore-submodules desc="Skip columnstore submodules initialization" variable=SKIP_SUBMODULES default=false value=true
optparse.define short=t long=build-type desc="Build Type: ${BUILD_TYPE_OPTIONS[*]}" variable=MCS_BUILD_TYPE optparse.define short=t long=build-type desc="Build Type: ${BUILD_TYPE_OPTIONS[*]}" variable=MCS_BUILD_TYPE
@ -195,10 +194,6 @@ modify_packaging() {
sed -i 's|.*-d storage/columnstore.*|elif [[ -d storage/columnstore/columnstore/debian ]]|' debian/autobake-deb.sh sed -i 's|.*-d storage/columnstore.*|elif [[ -d storage/columnstore/columnstore/debian ]]|' debian/autobake-deb.sh
fi fi
if [[ "$MARIADB_SERVER_VERSION" == 10.6* ]]; then
sed -i 's/mariadb-server/mariadb-server-10.6/' storage/columnstore/columnstore/debian/control
fi
#disable LTO for 22.04 for now #disable LTO for 22.04 for now
if [[ $OS == 'ubuntu:22.04' || $OS == 'ubuntu:24.04' ]]; then if [[ $OS == 'ubuntu:22.04' || $OS == 'ubuntu:24.04' ]]; then
apt install -y lto-disabled-list && apt install -y lto-disabled-list &&