From 04b20050d3e86da27bfd4978225719e639392650 Mon Sep 17 00:00:00 2001 From: Leonid Fedorov Date: Fri, 9 Aug 2024 06:48:01 +0400 Subject: [PATCH] add rpmbuild --- .drone.jsonnet | 3 +-- tests/scripts/fdb_build.sh | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/.drone.jsonnet b/.drone.jsonnet index b1b995f3d..c4ba2b712 100644 --- a/.drone.jsonnet +++ b/.drone.jsonnet @@ -90,8 +90,7 @@ local Pipeline(branch, platform, event, arch='amd64', server='10.6-enterprise') 'wget https://raw.githubusercontent.com/mariadb-corporation/mariadb-columnstore-engine/fdb_build/tests/scripts/fdb_build.sh', 'bash fdb_build.sh', 'mkdir -p /drone/src/' + result, - if (pkg_format == 'rpm') then 'cp /fdb_build/packages/*.rpm /drone/src/' + result else 'cp /fdb_build/packages/*.rpm /drone/src/' + result, - + if (pkg_format == 'rpm') then 'cp /fdb_build/packages/*.rpm /drone/src/' + result else 'cp /fdb_build/packages/*.deb /drone/src/' + result, ], }, ] + diff --git a/tests/scripts/fdb_build.sh b/tests/scripts/fdb_build.sh index c2f5188f6..9df0ce229 100644 --- a/tests/scripts/fdb_build.sh +++ b/tests/scripts/fdb_build.sh @@ -89,7 +89,7 @@ elif [[ ${ID} == "rocky" ]]; then curl https://download.mono-project.com/repo/centos8-stable.repo | tee /etc/yum.repos.d/mono-centos8-stable.repo fi - dnf install -y -q --allowerasing automake cmake curl dnf gcc git jemalloc-devel jq mono-devel patch perl python3-devel unzip + dnf install -y -q --allowerasing automake cmake curl dnf gcc git jemalloc-devel jq mono-devel patch perl python3-devel rpm-build unzip make_openssl OPENSSL_FLAGS=' -DOPENSSL_ROOT_DIR=/usr/local/openssl/ '