database/mariadb-columnstore-engine
1
0
Fork 0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2025-08-05 16:15:50 +03:00
Code Activity

static libstdc++ fro Rocky 8, do not install in build step, fix pathes

Browse Source
This commit is contained in:
Leonid Fedorov
2024-08-09 16:45:35 +04:00
parent e27067927f
commit 52e7532bd2
2 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.drone.jsonnet
View File

@@ -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', 'wget https://raw.githubusercontent.com/mariadb-corporation/mariadb-columnstore-engine/fdb_build/tests/scripts/fdb_build.sh',
'bash fdb_build.sh', 'bash fdb_build.sh',
'mkdir -p /drone/src/' + result, '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,
], ],
}, },
] + ] +

7
tests/scripts/fdb_build.sh
View File

@@ -80,10 +80,11 @@ elif [[ ${ID} == "rocky" ]]; then
message "Preparing dev requirements for Rockylinux 9" message "Preparing dev requirements for Rockylinux 9"
dnf install -y -q epel-release scl-utils yum-utils dnf install -y -q epel-release scl-utils yum-utils
dnf install -y -q gcc-c++ dnf install -y -q gcc-c++
dnf install -y -q --enablerepo devel libstdc++-static
else else
message "Preparing dev requirements for Rockylinux 8" 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 '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 . /opt/rh/gcc-toolset-${GCC_VERSION}/enable
rpmkeys --import "http://keyserver.ubuntu.com/pks/lookup?op=get&search=0x3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF" 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 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" message "Generating packages"
cpack -G ${GENERATOR} cpack -G ${GENERATOR}
message "Installing packages"
${PKG_MANAGER} packages/*.${PACKAGES_TYPE}
message "Checking statuses"
fdbcli --exec 'status json' | jq .client