From 52e7532bd25b95d02b16b6dcff0a225ef3414cb3 Mon Sep 17 00:00:00 2001 From: Leonid Fedorov Date: Fri, 9 Aug 2024 16:45:35 +0400 Subject: [PATCH] static libstdc++ fro Rocky 8, do not install in build step, fix pathes --- .drone.jsonnet | 2 +- tests/scripts/fdb_build.sh | 7 ++----- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/.drone.jsonnet b/.drone.jsonnet index c4ba2b712..3d04d0c1b 100644 --- a/.drone.jsonnet +++ b/.drone.jsonnet @@ -90,7 +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/*.deb /drone/src/' + result, + if (pkg_format == 'rpm') then 'cp /drone/src/fdb_build/packages/*.rpm /drone/src/' + result else 'cp /drone/src/fdb_build/packages/*.deb /drone/src/' + result, ], }, ] + diff --git a/tests/scripts/fdb_build.sh b/tests/scripts/fdb_build.sh index d0b1ab6d3..e0b506c41 100644 --- a/tests/scripts/fdb_build.sh +++ b/tests/scripts/fdb_build.sh @@ -80,10 +80,11 @@ elif [[ ${ID} == "rocky" ]]; then message "Preparing dev requirements for Rockylinux 9" dnf install -y -q epel-release scl-utils yum-utils dnf install -y -q gcc-c++ + dnf install -y -q --enablerepo devel libstdc++-static else message "Preparing dev requirements for Rockylinux 8" dnf install -y -q 'dnf-command(config-manager)' && dnf config-manager --set-enabled powertools - dnf install -y -q epel-release gcc-toolset-${GCC_VERSION} libstdc++-static + dnf install -y -q epel-release gcc-toolset-${GCC_VERSION} . /opt/rh/gcc-toolset-${GCC_VERSION}/enable rpmkeys --import "http://keyserver.ubuntu.com/pks/lookup?op=get&search=0x3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF" curl https://download.mono-project.com/repo/centos8-stable.repo | tee /etc/yum.repos.d/mono-centos8-stable.repo @@ -147,7 +148,3 @@ ${BUILD_COMMAND} message "Generating packages" cpack -G ${GENERATOR} -message "Installing packages" -${PKG_MANAGER} packages/*.${PACKAGES_TYPE} -message "Checking statuses" -fdbcli --exec 'status json' | jq .client