VladPolskiy/mariadb-columnstore-engine
1
0
Fork 0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2025-08-20 14:19:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

MCOL-5695: Add FoundationDB package as a dependency for CMAPI.

Browse Source
This commit is contained in:
mariadb-AlanMologorsky
2024-07-03 12:54:11 +03:00
committed by Leonid Fedorov
parent 148063e07a
commit f6c9d3b89d
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
.drone.jsonnet
View File

@ -590,10 +590,12 @@ local Pipeline(branch, platform, event, arch='amd64', server='10.6-enterprise')
image: 'plugins/docker', image: 'plugins/docker',
environment: { environment: {
VERSION: container_version, VERSION: container_version,
MCS_REPO: 'columnstore',
DEV: 'true', DEV: 'true',
MCS_REPO: 'columnstore',
// branchp has slash if not empty // branchp has slash if not empty
MCS_BASEURL: 'https://cspkg.s3.amazonaws.com/' + branchp + event + '/${DRONE_BUILD_NUMBER}/' + server + '/' + arch + '/' + result + '/', MCS_BASEURL: 'https://cspkg.s3.amazonaws.com/' + branchp + event + '/${DRONE_BUILD_NUMBER}/' + server + '/' + arch + '/' + result + '/',
FDB_REPO: 'foundationdb',
FDB_BASEURL: 'https://cspkg.s3.amazonaws.com/FoundationDB/' + arch + '/' + result + '/',
CMAPI_REPO: 'cmapi', CMAPI_REPO: 'cmapi',
CMAPI_BASEURL: 'https://cspkg.s3.amazonaws.com/' + branchp + event + '/${DRONE_BUILD_NUMBER}/' + server + '/' + arch + '/' + result + '/', CMAPI_BASEURL: 'https://cspkg.s3.amazonaws.com/' + branchp + event + '/${DRONE_BUILD_NUMBER}/' + server + '/' + arch + '/' + result + '/',
}, },
@ -601,7 +603,7 @@ local Pipeline(branch, platform, event, arch='amd64', server='10.6-enterprise')
repo: 'mariadb/enterprise-columnstore-dev', repo: 'mariadb/enterprise-columnstore-dev',
context: 'docker', context: 'docker',
dockerfile: 'docker/Dockerfile', dockerfile: 'docker/Dockerfile',
build_args_from_env: ['VERSION', 'MCS_REPO', 'MCS_BASEURL', 'CMAPI_REPO', 'CMAPI_BASEURL', 'DEV'], build_args_from_env: ['VERSION', 'MCS_REPO', 'MCS_BASEURL', 'CMAPI_REPO', 'CMAPI_BASEURL', 'DEV', 'FDB_REPO', 'FDB_BASEURL'],
tags: container_tags, tags: container_tags,
username: { username: {
from_secret: 'dockerhub_user', from_secret: 'dockerhub_user',

4
cmapi/CMakeLists.txt
View File

@ -132,7 +132,7 @@ IF(RPM)
SET(CPACK_RPM_USER_FILELIST "%config(noreplace) ${CMAPI_CONF_FILEPATH}") SET(CPACK_RPM_USER_FILELIST "%config(noreplace) ${CMAPI_CONF_FILEPATH}")
SET(CPACK_RPM_PACKAGE_OBSOLETES "mariadb-columnstore-cmapi") SET(CPACK_RPM_PACKAGE_OBSOLETES "mariadb-columnstore-cmapi")
SET(CPACK_RPM_PACKAGE_REQUIRES "curl") SET(CPACK_RPM_PACKAGE_REQUIRES "curl, foundationdb-server")
STRING(REPLACE "-" "_" SERVER_VERSION ${SERVER_VERSION}) STRING(REPLACE "-" "_" SERVER_VERSION ${SERVER_VERSION})
get_linux_lsb_release_information() get_linux_lsb_release_information()
@ -174,7 +174,7 @@ IF(DEB)
SET(CPACK_DEBIAN_PACKAGE_CONTROL_EXTRA "${CMAKE_CURRENT_SOURCE_DIR}/prerm;${CMAKE_CURRENT_SOURCE_DIR}/postinst;${CMAKE_CURRENT_SOURCE_DIR}/conffiles") SET(CPACK_DEBIAN_PACKAGE_CONTROL_EXTRA "${CMAKE_CURRENT_SOURCE_DIR}/prerm;${CMAKE_CURRENT_SOURCE_DIR}/postinst;${CMAKE_CURRENT_SOURCE_DIR}/conffiles")
SET(CPACK_DEBIAN_PACKAGE_REPLACES "mariadb-columnstore-cmapi") SET(CPACK_DEBIAN_PACKAGE_REPLACES "mariadb-columnstore-cmapi")
SET(CPACK_DEBIAN_PACKAGE_DEPENDS "curl") SET(CPACK_DEBIAN_PACKAGE_DEPENDS "curl, foundationdb-server")
STRING(REPLACE "-" "." SERVER_VERSION ${SERVER_VERSION}) STRING(REPLACE "-" "." SERVER_VERSION ${SERVER_VERSION})
SET(PATCHLEVEL "+maria") SET(PATCHLEVEL "+maria")
get_linux_lsb_release_information() get_linux_lsb_release_information()