diff --git a/.drone.jsonnet b/.drone.jsonnet index 61d256f3a..20da7542b 100644 --- a/.drone.jsonnet +++ b/.drone.jsonnet @@ -90,7 +90,6 @@ local Pipeline(branch, platform, event, arch='amd64', server='10.6-enterprise') 'mkdir -p ' + 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/mariadb_foundationdb-7.1.63_gcc.patch', 'bash fdb_build.sh', 'mkdir -p /drone/src/' + result, 'ls -al fdb_build/packages', diff --git a/tests/scripts/fdb_build.sh b/tests/scripts/fdb_build.sh index 5808c5129..a3014d226 100644 --- a/tests/scripts/fdb_build.sh +++ b/tests/scripts/fdb_build.sh @@ -5,8 +5,6 @@ FDB_VERSION=7.3.43 GCC_VERSION='11' CLANG_VERSION='16' BUILD_COMMAND='make -j2' -SCRIPT_LOCATION=$(dirname "$0") -SCRIPT_PATH=$(realpath $SCRIPT_LOCATION) . /etc/os-release @@ -195,12 +193,11 @@ wget https://github.com/apple/foundationdb/archive/refs/tags/${FDB_VERSION}.zip unzip -q ${FDB_VERSION}.zip +# assume patch file is already in the root / 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} -ls ${SCRIPT_PATH} -ls -pwd -patch -p1 -i ${SCRIPT_PATH}/mariadb_foundationdb-${FDB_VERSION}_gcc.patch +patch -p1 -i ../mariadb_foundationdb-${FDB_VERSION}_gcc.patch cd - diff --git a/utils/libmarias3/libmarias3 b/utils/libmarias3/libmarias3 index d7028f429..f74150b05 160000 --- a/utils/libmarias3/libmarias3 +++ b/utils/libmarias3/libmarias3 @@ -1 +1 @@ -Subproject commit d7028f429bb247c622eb9948d9b8d5356f03cb79 +Subproject commit f74150b05693440d35f93c43e2d2411cc66fee19