thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-11-23 08:02:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

release --rpm: Fix redefining version

Browse Source
This commit is contained in:
proller 2019-06-27 18:36:31 +03:00
parent 0bd65f49a2
commit 1bb911f742
3 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
debian/rules vendored
View File

@ -130,5 +130,7 @@ override_dh_auto_install:
override_dh_shlibdeps:
true # We depend only on libc and dh_shlibdeps gives us wrong (too strict) dependency.
#TODO: faster packing of non-release builds: ifdef RELEASE_COMPATIBLE
override_dh_builddeb:
dh_builddeb -- -Z gzip # Older systems don't have "xz", so use "gzip" instead.
#TODO: endif

3
release
View File

@ -113,9 +113,8 @@ export EXTRAPACKAGES
VERSION_STRING+=$VERSION_POSTFIX
echo -e "\nCurrent version is $VERSION_STRING"
gen_changelog "$VERSION_STRING" "" "$AUTHOR" ""
if [ -z "$NO_BUILD" ] ; then
gen_changelog "$VERSION_STRING" "" "$AUTHOR" ""
if [ -z "$USE_PBUILDER" ] ; then
DEB_CC=${DEB_CC:=`which gcc-7 gcc-8 gcc | head -n1`}
DEB_CXX=${DEB_CXX:=`which g++-7 g++-8 g++ | head -n1`}

10
utils/release/release_lib.sh
View File

@ -1,4 +1,5 @@
set +e
# set -x
function gen_version_string {
if [ -n "$TEST" ]; then
@ -181,9 +182,8 @@ function gen_dockerfiles {
}
function make_rpm {
get_version
[ -z "$VERSION_STRING" ] && get_version
VERSION_FULL=${VERSION_STRING}${VERSION_POSTFIX}
[ -z "$VERSION_STRING" ] && get_version && VERSION_STRING+=${VERSION_POSTFIX}
VERSION_FULL="${VERSION_STRING}"
PACKAGE_DIR=${PACKAGE_DIR=../}
function deb_unpack {
@ -257,8 +257,8 @@ function make_rpm {
}
function make_tgz {
[ -z "$VERSION_STRING" ] && get_version
VERSION_FULL="${VERSION_STRING}${VERSION_POSTFIX}"
[ -z "$VERSION_STRING" ] && get_version && VERSION_STRING+=${VERSION_POSTFIX}
VERSION_FULL="${VERSION_STRING}"
PACKAGE_DIR=${PACKAGE_DIR=../}
for PACKAGE in clickhouse-server clickhouse-client clickhouse-test clickhouse-common-static clickhouse-common-static-dbg; do