1
0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2025-08-08 14:22:09 +03:00

I confused myself

This commit is contained in:
Leonid Fedorov
2024-11-15 15:52:32 +00:00
parent 26d4dfc6ec
commit 5d30630544
3 changed files with 4 additions and 8 deletions

View File

@@ -90,7 +90,6 @@ local Pipeline(branch, platform, event, arch='amd64', server='10.6-enterprise')
'mkdir -p ' + builddir, 'mkdir -p ' + builddir,
'cd ' + builddir, 'cd ' + builddir,
'wget https://raw.githubusercontent.com/mariadb-corporation/mariadb-columnstore-engine/fdb_build/tests/scripts/fdb_build.sh', 'wget https://raw.githubusercontent.com/mariadb-corporation/mariadb-columnstore-engine/fdb_build/tests/scripts/fdb_build.sh',
'wget https://raw.githubusercontent.com/mariadb-corporation/mariadb-columnstore-engine/fdb_build/tests/scripts/mariadb_foundationdb-7.1.63_gcc.patch',
'bash fdb_build.sh', 'bash fdb_build.sh',
'mkdir -p /drone/src/' + result, 'mkdir -p /drone/src/' + result,
'ls -al fdb_build/packages', 'ls -al fdb_build/packages',

View File

@@ -5,8 +5,6 @@ FDB_VERSION=7.3.43
GCC_VERSION='11' GCC_VERSION='11'
CLANG_VERSION='16' CLANG_VERSION='16'
BUILD_COMMAND='make -j2' BUILD_COMMAND='make -j2'
SCRIPT_LOCATION=$(dirname "$0")
SCRIPT_PATH=$(realpath $SCRIPT_LOCATION)
. /etc/os-release . /etc/os-release
@@ -195,12 +193,11 @@ wget https://github.com/apple/foundationdb/archive/refs/tags/${FDB_VERSION}.zip
unzip -q ${FDB_VERSION}.zip unzip -q ${FDB_VERSION}.zip
# assume patch file is already in the root /
message "Patching sources" message "Patching sources"
wget https://raw.githubusercontent.com/mariadb-corporation/mariadb-columnstore-engine/fdb_build/tests/scripts/mariadb_foundationdb-${FDB_VERSION}_gcc.patch
cd foundationdb-${FDB_VERSION} cd foundationdb-${FDB_VERSION}
ls ${SCRIPT_PATH} patch -p1 -i ../mariadb_foundationdb-${FDB_VERSION}_gcc.patch
ls
pwd
patch -p1 -i ${SCRIPT_PATH}/mariadb_foundationdb-${FDB_VERSION}_gcc.patch
cd - cd -